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

Mon Apr 24 15:33:47 PDT 2000 

(KainX)

Patch from Bob Arendt <rdarendt@cwcom.net> for move/resize geometry
box location.


SVN revision: 2527
This commit is contained in:
Michael Jennings 2000-04-24 22:21:29 +00:00
parent e978a4ac4d
commit c9f4976169
47 changed files with 2045 additions and 1902 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -4638,3 +4638,11 @@ Mon Apr 10 15:43:56 PDT 2000
(Mandrake)
fix for bringing iconified windows to current head when using the tasklist.
-------------------------------------------------------------------------------
Mon Apr 24 15:33:47 PDT 2000
(KainX)
Patch from Bob Arendt <rdarendt@cwcom.net> for move/resize geometry
box location.

1965
src/E.h
View File

File diff suppressed because it is too large Load Diff

97
src/actions.c
View File

@ -663,7 +663,7 @@ runApp(char *exe, char *params)
DialogAlertOK(_("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
@ -687,26 +687,26 @@ runApp(char *exe, char *params)
/* can execute it */
if (canexec((char *)path))
DialogAlertOK(_
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"I am unsure as to why you could not "
"do this. The file exists,\n"
"is a file, and you are allowed to "
"execute it. I suggest you look\n"
"into this.\n"), (char *)path);
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"I am unsure as to why you could not "
"do this. The file exists,\n"
"is a file, and you are allowed to "
"execute it. I suggest you look\n"
"into this.\n"), (char *)path);
/* not executable file */
else
DialogAlertOK(_
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"This is because the file exists, is a "
"file, but you are unable\n"
"to execute it because you do not "
"have execute "
"access to this file.\n"),
(char *)path);
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"This is because the file exists, is a "
"file, but you are unable\n"
"to execute it because you do not "
"have execute "
"access to this file.\n"),
(char *)path);
}
/* it's not a file */
else
@ -714,19 +714,19 @@ runApp(char *exe, char *params)
/* its a dir */
if (isdir((char *)path))
DialogAlertOK(_
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"This is because the file is in fact "
"a directory.\n"), (char *)path);
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"This is because the file is in fact "
"a directory.\n"), (char *)path);
/* its not a file or a dir */
else
DialogAlertOK(_
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"This is because the file is not a "
"regular file.\n"), (char *)path);
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
"This is because the file is not a "
"regular file.\n"), (char *)path);
}
if (path)
Efree(path);
@ -1369,11 +1369,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];
@ -2474,7 +2474,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))
@ -2504,7 +2504,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))
@ -3469,7 +3469,7 @@ doConfigure(void *params)
{
ChooseGroupDialog(ewin,
_
(" Pick the group the window will belong to: \n"),
(" Pick the group the window will belong to: \n"),
GROUP_SELECT_ALL_EXCEPT_EWIN,
ACTION_ADD_TO_GROUP);
}
@ -3496,7 +3496,8 @@ struct _keyset
int
doInsertKeys(void *params)
{
const struct _keyset ks[] = {
const struct _keyset ks[] =
{
{"a", 0, "a"},
{"b", 0, "b"},
{"c", 0, "c"},
@ -3721,8 +3722,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;
@ -3827,10 +3828,10 @@ doAddToGroup(void *params)
{
ChooseGroupDialog(ewin,
_("\n There's no current group at the moment. \n"
" The current group is the last one you created, \n"
" and it exists until you create a new one or break \n"
" The current group is the last one you created, \n"
" and it exists until you create a new one or break \n"
" the latest one. \n\n"
" Pick another group that the window will belong to here: \n\n"),
" Pick another group that the window will belong to here: \n\n"),
GROUP_SELECT_ALL_EXCEPT_EWIN, ACTION_ADD_TO_GROUP);
EDBUG_RETURN(0);
}
@ -3912,19 +3913,19 @@ doZoom(void *params)
{
fprintf(f,
_
("You have been warned about the dangers of Zoom mode\n"));
("You have been warned about the dangers of Zoom mode\n"));
fclose(f);
}
DIALOG_OK(_("Warning !!!"),
_("This feature is heavily reliant on a feature of your\n"
"X Server called the Vid Mode Extension. This feature exists\n"
"in XFree86 Servers, but is not a heavily used part of the\n"
"X Server called the Vid Mode Extension. This feature exists\n"
"in XFree86 Servers, but is not a heavily used part of the\n"
"Server and thus isn't tested much.\n\n"
"It is possible your X Server does not deal well with being\n"
"It is possible your X Server does not deal well with being\n"
"asked to switch modes quickly and it may hang, glitch,\n"
"display artefacts or perhaps simply refuse to work.\n\n"
"This is a warning and will only be displayed this one time.\n"
"If your Server does not behave well then you will probably\n"
"This is a warning and will only be displayed this one time.\n"
"If your Server does not behave well then you will probably\n"
"have to avoid using this feature.\n"));
EDBUG_RETURN(0);
}

2
src/alert.c
View File

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

10
src/areas.c
View File

@ -191,9 +191,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");
@ -469,11 +469,11 @@ 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)
{

8
src/arrange.c
View File

@ -762,7 +762,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,
@ -797,7 +797,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) &&
@ -831,7 +831,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,
@ -866,7 +866,7 @@ SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, int *new_dy)
if (((ewin->desktop == lst[i]->desktop) ||
(lst[i]->sticky)) &&
(!(lst[i]->floating)) &&
(!(lst[i]->iconified)) && (!(lst[i]->ignorearrange)))
(!(lst[i]->iconified)) && (!(lst[i]->ignorearrange)))
{
if (IN_ABOVE(ewin->y + ewin->h + dy - 1, lst[i]->y,
mode.edge_snap_dist) &&

10
src/arrange.h
View File

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

6
src/borders.c
View File

@ -269,7 +269,7 @@ SlideEwinsTo(EWin ** ewin, int *fx, int *fy, int *tx, int *ty,
int num_wins, int speed)
{
int k, spd, *x = NULL, *y =
NULL, min, tmpx, tmpy, tmpw, tmph, i;
NULL, min, tmpx, tmpy, tmpw, tmph, i;
struct timeval timev1, timev2;
int dsec, dusec;
double tm;
@ -1784,7 +1784,7 @@ SetEwinBorder(EWin * ewin)
else
b = MatchEwinByFunction(ewin, (void *(*)(EWin *, WindowMatch *))
(MatchEwinBorder));
if (mode.dockapp_support&&ewin->docked)
if (mode.dockapp_support && ewin->docked)
b = (Border *) FindItem("BORDERLESS", 0, LIST_FINDBY_NAME,
LIST_TYPE_BORDER);
if (!b)
@ -2641,7 +2641,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->

12
src/comms.c
View File

@ -1528,9 +1528,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();
@ -1571,7 +1571,7 @@ HandleComms(XEvent * ev)
GetAreaSize(&a, &b);
Esnprintf(buf, sizeof(buf),
"FOCUSMODE: %i\n"
"DOCKAPP_SUPPORT: %i\n"
"DOCKAPP_SUPPORT: %i\n"
"DOCKDIRMODE: %i\n"
"ICONDIRMODE: %i\n"
"MOVEMODE: %i\n"
@ -1841,7 +1841,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,
@ -1935,7 +1935,7 @@ HandleComms(XEvent * ev)
{
char buf[FILEPATH_LEN_MAX], *ret = NULL, none[] =
"-NONE-";
"-NONE-";
EWin **lst;
int i, num;

1
src/conf.h
View File

@ -137,6 +137,7 @@
#define CONTROL_SHOWROOTTOOLTIP 1368
#define CONTROL_PAGER_BUTTONS 1369
#define CONTROL_DOCKAPP_SUPPORT 1370
#define CONTROL_GEOMINFOMODE 1371
#define ICLASS_NAME 350
#define ICLASS_NORMAL 351

47
src/config.c
View File

@ -579,6 +579,9 @@ Config_Control(FILE * ConfigFile)
case CONTROL_RESIZEMODE:
mode.resizemode = i2;
break;
case CONTROL_GEOMINFOMODE:
mode.geominfomode = i2;
break;
case CONTROL_SLIDEMODE:
mode.slidemode = i2;
break;
@ -1181,7 +1184,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;
@ -1384,7 +1387,7 @@ Config_Border(FILE * ConfigFile)
}
}
Alert(_("Warning: Configuration appears to have ended before we were\n"
"Done loading a Main Border block. Outcome is likely not good.\n"));
"Done loading a Main Border block. Outcome is likely not good.\n"));
}
void
@ -1449,7 +1452,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);
@ -2240,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));
@ -2277,7 +2280,7 @@ Config_ActionClass(FILE * ConfigFile)
Efree(action_tooltipstring);
RecoverUserConfig();
Alert(_("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
@ -2482,7 +2485,7 @@ Config_ImageClass(FILE * ConfigFile)
}
}
Alert(_("Warning: Configuration appears to have ended before we were\n"
"Done loading an ImageClass block. Outcome is likely not good.\n"));
"Done loading an ImageClass block. Outcome is likely not good.\n"));
}
void
@ -3137,7 +3140,7 @@ Config_WindowMatch(FILE * ConfigFile)
}
}
Alert(_("Warning: Configuration appears to have ended before we were\n"
"Done loading an WindowMatch block. Outcome is likely not good.\n"));
"Done loading an WindowMatch block. Outcome is likely not good.\n"));
}
int
@ -3189,7 +3192,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(_("error"));
}
@ -3417,7 +3420,7 @@ 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"
"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;
@ -3439,8 +3442,8 @@ LoadOpenConfigFile(FILE * ConfigFile)
"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"
"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"),
@ -3675,14 +3678,14 @@ LoadEConfig(char *themelocation)
"system, and so it will have almost no configuration loaded\n"
"when it starts up. This is most likely the sign of a bad\n"
"installation of Enlightenment if this directory is missing.\n"
"The likely causes are that the package was improperly built,\n"
"The likely causes are that the package was improperly built,\n"
"if a binary package, or 'make install' hasn't been typed\n"
"or during the installation the directory above was not\n"
"able to be copied over for installation perhaps due to\n"
"permissions or lack of disk space. It also could be that the\n"
"permissions or lack of disk space. It also could be that the\n"
"config directory has been inadvertently deleted since\n"
"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"
@ -3696,7 +3699,8 @@ LoadEConfig(char *themelocation)
{
Progressbar *p = NULL;
int i;
char *config_files[] = {
char *config_files[] =
{
"init.cfg",
"control.cfg",
"textclasses.cfg",
@ -3789,6 +3793,7 @@ SaveUserControlConfig(FILE * autosavefile)
fprintf(autosavefile, "307 %i\n", (int)mode.focusmode);
fprintf(autosavefile, "311 %i\n", (int)mode.movemode);
fprintf(autosavefile, "312 %i\n", (int)mode.resizemode);
fprintf(autosavefile, "1371 %i\n", (int)mode.geominfomode);
fprintf(autosavefile, "9 %i\n", (int)mode.sound);
fprintf(autosavefile, "313 %i\n", (int)mode.slidemode);
fprintf(autosavefile, "314 %i\n", (int)mode.cleanupslide);
@ -4169,12 +4174,12 @@ RecoverUserConfig(void)
_("Yes, Attempt recovery"),
_("Restart and try again"), _("Quit and give up"));
Alert(_
("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);

46
src/coords.c
View File

@ -35,6 +35,9 @@ SetCoords(int x, int y, int w, int h)
EWin *ewin;
int md;
if (!mode.geominfomode)
return;
if (!tc)
tc = FindItem("COORDS", 0, LIST_FINDBY_NAME, LIST_TYPE_TCLASS);
if (!ic)
@ -63,34 +66,23 @@ SetCoords(int x, int y, int w, int h)
}
else
{
switch (md)
cx = 0;
cy = 0;
if (mode.geominfomode == 1)
{
case 0:
case 1:
case 2:
cx =
ewin->x + ((ewin->w - cw) / 2) +
desks.desk[ewin->desktop].x;
cy =
ewin->y + ((ewin->h - ch) / 2) +
desks.desk[ewin->desktop].y;
break;
case 3:
cx = 0;
cy = 0;
break;
case 4:
cx = 0;
cy = 0;
break;
case 5:
cx = 0;
cy = 0;
break;
default:
cx = 0;
cy = 0;
break;
switch (md)
{
case 0:
case 1:
case 2:
cx =
ewin->x + ((ewin->w - cw) / 2) +
desks.desk[ewin->desktop].x;
cy =
ewin->y + ((ewin->h - ch) / 2) +
desks.desk[ewin->desktop].y;
break;
}
}
}
}

14
src/desktops.c
View File

@ -28,10 +28,10 @@ GetUniqueBGString(Background * bg)
char s[256];
const char *chmap =
#ifndef __EMX__
"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
#else
"0123456789abcdefghijklmnopqrstuvwxyz€<EFBFBD>‚ƒ„…†‡ˆŠ‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™<EFBFBD>-_";
"0123456789abcdefghijklmnopqrstuvwxyz€<EFBFBD>‚ƒ„…†‡ˆŠ‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™<EFBFBD>-_";
/* cyrillic symbols from 866 page correctly handled instead of eng. capitals */
#endif
@ -1112,7 +1112,7 @@ InitDesktopControls()
"back and forth.\n"
"Click right mouse button for a list of all\n"
"Desktops and their applications.\n"
"Click middle mouse button for a list of all\n"
"Click middle mouse button for a list of all\n"
"applications currently running.\n"));
}
else
@ -1122,7 +1122,7 @@ InitDesktopControls()
"You cannot drag the root desktop around.\n"
"Click right mouse button for a list of all\n"
"Desktops and their applications.\n"
"Click middle mouse button for a list of all\n"
"Click middle mouse button for a list of all\n"
"applications currently running.\n"));
}
}
@ -1306,17 +1306,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;

28
src/dialog.c
View File

@ -280,7 +280,7 @@ DialogQuit(int val, void *data)
}
void
DialogAlert(char *fmt, ...)
DialogAlert(char *fmt,...)
{
char text[10240];
va_list ap;
@ -293,7 +293,7 @@ DialogAlert(char *fmt, ...)
}
void
DialogAlertOK(char *fmt, ...)
DialogAlertOK(char *fmt,...)
{
char text[10240];
va_list ap;
@ -307,7 +307,7 @@ DialogAlertOK(char *fmt, ...)
}
void
DialogSetParamText(Dialog * d, char *fmt, ...)
DialogSetParamText(Dialog * d, char *fmt,...)
{
char text[10240];
va_list ap;
@ -704,7 +704,7 @@ ShowDialog(Dialog * d)
if (pointer_x >= screens[i].x_org)
{
if (pointer_x <=
(screens[i].width + screens[i].x_org))
(screens[i].width + screens[i].x_org))
{
if (pointer_y >= screens[i].y_org)
{
@ -1202,7 +1202,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);
}
}
@ -1350,7 +1350,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));
@ -1466,7 +1466,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
dii->y, 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
@ -1479,7 +1479,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
@ -1529,7 +1529,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 +
@ -1543,7 +1543,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;
@ -1755,11 +1755,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,
@ -1796,11 +1796,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,

12
src/draw.c
View File

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

6
src/events.c
View File

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

64
src/evhandlers.c
View File

@ -43,11 +43,11 @@
static ToolTip *ttip = NULL;
struct _mdata
{
Menu *m;
MenuItem *mi;
EWin *ewin;
};
{
Menu *m;
MenuItem *mi;
EWin *ewin;
};
static void ToolTipTimeout(int val, void *data);
static void SubmenuShowTimeout(int val, void *dat);
@ -72,10 +72,12 @@ ToolTipTimeout(int val, void *data)
/* In the case of multiple screens, check to make sure
* the root window is still where the mouse is... */
if (False == XQueryPointer(disp, root.win, &rt, &ch, &x, &y, &dum,
&dum, &mask)) EDBUG_RETURN_;
&dum, &mask))
EDBUG_RETURN_;
/* dont pop up tooltip is mouse button down */
if (mask & (Button1Mask | Button2Mask | Button3Mask |
Button4Mask | Button5Mask)) EDBUG_RETURN_;
Button4Mask | Button5Mask))
EDBUG_RETURN_;
win = WindowAtXY(x, y);
ac = FindActionClass(win);
if (!ac)
@ -478,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
@ -493,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;
@ -502,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
@ -517,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;
@ -744,7 +746,8 @@ HandleMotion(XEvent * ev)
if (y < 0)
y = -y;
if ((x > mode.button_move_resistance) ||
(y > mode.button_move_resistance)) mode.button_move_pending =
(y > mode.button_move_resistance))
mode.button_move_pending =
0;
}
if (!mode.button_move_pending)
@ -773,6 +776,7 @@ HandleMotion(XEvent * ev)
#ifdef HAS_XINERAMA
static XineramaScreenInfo *screens;
static int num_screens;
#endif
EWin *menus[256];
int fx[256];
@ -1149,7 +1153,7 @@ HandleDestroy(XEvent * ev)
mode.mouse_over_win = NULL;
if (ewin == mode.ewin)
mode.ewin = NULL;
if (mode.dockapp_support&&ewin->docked)
if (mode.dockapp_support && ewin->docked)
DockDestroy(ewin);
DesktopRemoveEwin(ewin);
FreeEwin(ewin);
@ -1494,7 +1498,7 @@ HandleUnmap(XEvent * ev)
mode.mode = MODE_NONE;
mode.context_pager = NULL;
}
if (mode.dockapp_support&&ewin->docked)
if (mode.dockapp_support && ewin->docked)
DockDestroy(ewin);
if (ewin == mode.ewin)
{
@ -1721,9 +1725,9 @@ HandleMouseDown(XEvent * ev)
DoIn("TOOLTIP_TIMEOUT", mode.tiptime, ToolTipTimeout, 0, NULL);
if (
(((float)(ev->xbutton.time - last_time) / 1000) <
mode_double_click_time)
&& ((int)(ev->xbutton.button) == (int)(last_button)))
(((float)(ev->xbutton.time - last_time) / 1000) <
mode_double_click_time)
&& ((int)(ev->xbutton.button) == (int)(last_button)))
double_click = 1;
last_time = ev->xbutton.time;
last_button = ev->xbutton.button;
@ -2000,7 +2004,8 @@ HandleMouseDown(XEvent * ev)
if ((ewin) && (!ewin->pager))
{
Window dw;
int wx, wy, ww, wh, ax, ay, cx, cy, px, py;
int wx, wy, ww, wh, ax, ay, cx, cy,
px, py;
PagerHideHi(p);
pwin_px = ewin->x;
@ -2479,15 +2484,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;
@ -2498,7 +2503,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;
@ -2611,7 +2617,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 -

6
src/focus.c
View File

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

91
src/fx.c
View File

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

15
src/gnome.c
View File

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

8
src/groups.c
View File

@ -251,7 +251,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;
@ -600,9 +600,9 @@ ChooseGroupDialog(EWin * ewin, char *message, char group_select, int action)
{
DIALOG_OK(_("Window Group Error"),
_
("\n This window currently does not belong to any groups. \n"
" You can only destroy groups or remove windows from groups \n"
" through a window that actually belongs to at least one group.\n\n"));
("\n This window currently does not belong to any groups. \n"
" You can only destroy groups or remove windows from groups \n"
" through a window that actually belongs to at least one group.\n\n"));
return;
}
if ((num_groups == 0) && (group_select == GROUP_SELECT_ALL_EXCEPT_EWIN))

40
src/handlers.c
View File

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

26
src/iconify.c
View File

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

959
src/ipc.c
View File

File diff suppressed because it is too large Load Diff

8
src/kde.c
View File

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

2
src/main.c
View File

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

32
src/memory.c
View File

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

15
src/menus.c
View File

@ -738,7 +738,7 @@ RealizeMenu(Menu * m)
{
int i, maxh = 0, maxw =
0, maxx1, maxx2, w, h, x, y, r, mmw, mmh;
0, maxx1, maxx2, w, h, x, y, r, mmw, mmh;
unsigned int iw, ih;
ImlibImage *im;
XSetWindowAttributes att;
@ -1070,10 +1070,10 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
struct stat st;
const char *chmap =
#ifndef __EMX__
"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
#else
"0123456789abcdefghijklmnopqrstuvwxyz€≠ヤ<EFBFBD>㊧葛訣誌髄駐舶沫<EFBFBD><EFBFBD>-_";
"0123456789abcdefghijklmnopqrstuvwxyz€≠ヤ<EFBFBD>㊧葛訣誌髄駐舶沫<EFBFBD><EFBFBD>-_";
#endif
FILE *f;
@ -1374,7 +1374,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);
@ -1389,7 +1389,7 @@ CreateMenuFromDirectory(char *name, MenuStyle * ms, char *dir)
ImlibColor icl;
char tile = 1, keep_asp = 0;
int width, height, scalex =
0, scaley = 0;
0, scaley = 0;
int scr_asp, im_asp, w2, h2;
int maxw = 48, maxh = 48;
@ -1758,7 +1758,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))
@ -1770,8 +1770,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=")]));

37
src/misc.c
View File

@ -38,15 +38,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++)
{
@ -63,12 +64,12 @@ BlumFlimFrub(void)
"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);
}
@ -76,11 +77,11 @@ BlumFlimFrub(void)
{
Alert(_("!!!!!!!! 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);
}
@ -100,12 +101,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);
}
@ -125,9 +126,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);

8
src/modules.c
View File

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

22
src/mwm.c
View File

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

10
src/network.c
View File

@ -30,11 +30,11 @@
*/
typedef struct conn_data_tag
{
int read_sock;
int write_sock;
ghttp_request *req;
}
{
int read_sock;
int write_sock;
ghttp_request *req;
}
conn_data;
#endif

21
src/pager.c
View File

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

44
src/session.c
View File

@ -47,10 +47,10 @@ Emkstemp(char *template)
{
static const char letters[]
#ifndef __EMX__
= "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
= "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
#else
= "abcdefghijklmnopqrstuvwxyz€<EFBFBD>‚ƒ„…†‡ˆŠ‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>Ž‘’“”•–—˜™0123456789";
= "abcdefghijklmnopqrstuvwxyz€<EFBFBD>‚ƒ„…†‡ˆŠ‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>Ž‘’“”•–—˜™0123456789";
#endif
@ -140,16 +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;
int desktop, iconified, shaded, sticky, layer;
}
{
char *session_id;
char *name;
char *class;
char *role;
char *command;
char used;
int x, y, w, h;
int desktop, iconified, shaded, sticky, layer;
}
Match;
Match *matches = NULL;
@ -742,14 +742,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},
@ -761,8 +765,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;
@ -1089,7 +1095,7 @@ ProcessICEMSGS(void)
DialogAlert(_("ERROR!\n"
"\n"
"Lost the Session Manager that was there?\n"
"Here here session manager... come here... want a bone?\n"
"Here here session manager... come here... want a bone?\n"
"Oh come now! Stop sulking! Bugger. Oh well. "
"Will continue without\n"
"a session manager.\n"

100
src/settings.c
View File

@ -171,7 +171,7 @@ SettingsPager(void)
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("Smooth high quality snapshots in snapshot mode"));
("Smooth high quality snapshots in snapshot mode"));
DialogItemCheckButtonSetState(di, tmp_pager_hiq);
DialogItemCheckButtonSetPtr(di, &tmp_pager_hiq);
@ -181,7 +181,7 @@ SettingsPager(void)
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("Zoom in on pager windows when mouse is over them"));
("Zoom in on pager windows when mouse is over them"));
DialogItemCheckButtonSetState(di, tmp_pager_zoom);
DialogItemCheckButtonSetPtr(di, &tmp_pager_zoom);
@ -191,7 +191,7 @@ SettingsPager(void)
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("Pop up window title when mouse is over the window"));
("Pop up window title when mouse is over the window"));
DialogItemCheckButtonSetState(di, tmp_pager_title);
DialogItemCheckButtonSetPtr(di, &tmp_pager_title);
@ -501,7 +501,7 @@ SettingsFocus(void)
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("Only new dialogs whose owner is focused get the focus"));
("Only new dialogs whose owner is focused get the focus"));
DialogItemCheckButtonSetState(di, tmp_owner_popup_focus);
DialogItemCheckButtonSetPtr(di, &tmp_owner_popup_focus);
@ -519,7 +519,7 @@ SettingsFocus(void)
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("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);
@ -585,7 +585,7 @@ SettingsFocus(void)
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("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 */
@ -607,6 +607,7 @@ SettingsFocus(void)
static int tmp_move;
static int tmp_resize;
static int tmp_geominfo = 1;
static void CB_ConfigureMoveResize(int val, void *data);
static void
@ -616,6 +617,7 @@ CB_ConfigureMoveResize(int val, void *data)
{
mode.movemode = tmp_move;
mode.resizemode = tmp_resize;
mode.geominfomode = tmp_geominfo;
}
autosave();
data = NULL;
@ -625,7 +627,7 @@ void
SettingsMoveResize(void)
{
Dialog *d;
DItem *table, *di, *radio1, *radio2;
DItem *table, *di, *radio1, *radio2, *radio3;
if ((d = FindItem("CONFIGURE_MOVERESIZE", 0, LIST_FINDBY_NAME,
LIST_TYPE_DIALOG)))
@ -638,6 +640,7 @@ SettingsMoveResize(void)
tmp_move = mode.movemode;
tmp_resize = mode.resizemode;
tmp_geominfo = mode.geominfomode;
d = CreateDialog("CONFIGURE_MOVERESIZE");
DialogSetTitle(d, _("Move & Resize Settings"));
@ -764,6 +767,44 @@ SettingsMoveResize(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Move/Resize Geometry Info Postion:"));
radio3 = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Window Center (O/T/B Methods)"));
DialogItemRadioButtonSetFirst(di, radio3);
DialogItemRadioButtonGroupSetVal(di, 1);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Always Screen corner"));
DialogItemRadioButtonSetFirst(di, radio3);
DialogItemRadioButtonGroupSetVal(di, 2);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Don't show"));
DialogItemRadioButtonSetFirst(di, radio3);
DialogItemRadioButtonGroupSetVal(di, 0);
DialogItemRadioButtonGroupSetValPtr(radio3, &tmp_geominfo);
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureMoveResize, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureMoveResize, 0);
DialogAddButton(d, _("Close"), CB_ConfigureMoveResize, 1);
@ -1261,7 +1302,7 @@ SettingsPlacement(void)
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("Dialog windows appear together with their owner"));
("Dialog windows appear together with their owner"));
DialogItemCheckButtonSetState(di, tmp_with_leader);
DialogItemCheckButtonSetPtr(di, &tmp_with_leader);
@ -1453,7 +1494,7 @@ SettingsTooltips(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Tooltip\n" "Settings Dialog\n"));
_("Enlightenment Tooltip\n" "Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -1982,7 +2023,7 @@ SettingsSpecialFX(void)
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 4);
DialogItemCheckButtonSetText(di,
_("Use saveunders to reduce window exposures"));
_("Use saveunders to reduce window exposures"));
DialogItemCheckButtonSetState(di, tmp_saveunders);
DialogItemCheckButtonSetPtr(di, &tmp_saveunders);
@ -2798,7 +2839,7 @@ CB_BGAreaEvent(int val, void *data)
stmp = duplicate(_("-NONE-"));
Esnprintf(s, sizeof(s),
_
("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);
@ -3672,7 +3713,7 @@ SettingsIconbox(char *name)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Iconbox\n" "Settings Dialog\n"));
_("Enlightenment Iconbox\n" "Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -3736,7 +3777,7 @@ SettingsIconbox(char *name)
DialogItemSetAlign(di, 0, 0);
DialogItemTextSetText(di,
_
("Alignment of anchoring when automatically resizing:"));
("Alignment of anchoring when automatically resizing:"));
di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -3758,14 +3799,14 @@ SettingsIconbox(char *name)
DialogItemSetAlign(di, 0, 0);
DialogItemTextSetText(di,
_
("Icon image display policy (if one operation fails, try the next):"));
("Icon image display policy (if one operation fails, try the next):"));
radio4 = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di,
_
("Snapshot Windows, Use application icon, Use Enlightenment Icon"));
("Snapshot Windows, Use application icon, Use Enlightenment Icon"));
DialogItemRadioButtonSetFirst(di, radio4);
DialogItemRadioButtonGroupSetVal(di, 0);
@ -3774,7 +3815,7 @@ SettingsIconbox(char *name)
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di,
_
("Use application icon, Use Enlightenment Icon, Snapshot Window"));
("Use application icon, Use Enlightenment Icon, Snapshot Window"));
DialogItemRadioButtonSetFirst(di, radio4);
DialogItemRadioButtonGroupSetVal(di, 1);
@ -4028,7 +4069,7 @@ SettingsGroups(EWin * ewin)
{
DIALOG_OK(_("Window Group Error"),
_
("\n This window currently does not belong to any groups. \n\n"));
("\n This window currently does not belong to any groups. \n\n"));
return;
}
if ((d = FindItem("CONFIGURE_GROUP", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
@ -4361,19 +4402,20 @@ SettingsDefaultGroupControl(void)
* callback funcs besides the dialog itself -- this is much easier */
static RememberWinList **rd_ewin_list;
void RemoveRememberedWindow(EWin *ewin)
void
RemoveRememberedWindow(EWin * ewin)
{
RememberWinList *rd;
RememberWinList *rd;
for (rd=rd_ewin_list[0]; rd; rd++)
if (rd->ewin==ewin)
{
rd->ewin=0;
rd->remember=0;
break;
}
for (rd = rd_ewin_list[0]; rd; rd++)
if (rd->ewin == ewin)
{
rd->ewin = 0;
rd->remember = 0;
break;
}
return;
return;
}
void CB_ApplyRemember(int val, void *data);
@ -4440,7 +4482,7 @@ CB_RememberWindowSettings(int val, void *data)
val = 0;
if (!data)
return;
rd = (RememberWinList*) data;
rd = (RememberWinList *) data;
ewin = (EWin *) rd->ewin;
if (!ewin)
return;
@ -4557,7 +4599,7 @@ SettingsRemember()
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_
("There are no active windows with remembered attributes."));
("There are no active windows with remembered attributes."));
}
di = DialogAddItem(table, DITEM_SEPARATOR);

15
src/setup.c
View File

@ -221,10 +221,10 @@ SetupX()
Alert(_("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"
"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"
"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"
"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"));
@ -401,7 +401,7 @@ SetupX()
ASSIGN_ALERT(_("X server version error"),
_("Ignore this error"), "", _("Quit Enlightenment"));
Alert(_("WARNING:\n"
"This is not an X11 Xserver. It in fact talks the X%i protocol.\n"
"This is not an X11 Xserver. It in fact talks the X%i protocol.\n"
"This may mean Enlightenment will either not function, or\n"
"function incorrectly. If it is later than X11, then your\n"
"server is one the author of Enlightenment neither have\n"
@ -432,7 +432,8 @@ SetupX()
XModifierKeymap *mod;
KeyCode nl, sl;
int i;
int masks[8] = {
int masks[8] =
{
ShiftMask, LockMask, ControlMask, Mod1Mask, Mod2Mask, Mod3Mask,
Mod4Mask, Mod5Mask
};
@ -632,7 +633,7 @@ ChkDir(char *d)
if (!isdir(d))
{
Alert(_("The directory %s is apparently not a directory\n"
"This is a fatal condition.\n" "Please remove this file\n"), d);
"This is a fatal condition.\n" "Please remove this file\n"), d);
EExit((void *)1);
}
if (!canexec(d))

66
src/size.c
View File

@ -97,12 +97,12 @@ MaxHeight(EWin * ewin, char *resize_type)
for (i = 0; i < num; i++)
{
if (
(((ewin->desktop
== lst[i]->desktop) && !(lst[i]->iconified))
|| (lst[i]->sticky)) && (!(lst[i]->floating))
&& (lst[i] != ewin) && (!(lst[i]->ignorearrange))
&& SPANS_COMMON(ewin->x, ewin->w, lst[i]->x,
lst[i]->w))
(((ewin->desktop
== lst[i]->desktop) && !(lst[i]->iconified))
|| (lst[i]->sticky)) && (!(lst[i]->floating))
&& (lst[i] != ewin) && (!(lst[i]->ignorearrange))
&& 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))
@ -178,12 +178,12 @@ MaxHeight(EWin * ewin, char *resize_type)
for (i = 0; i < num; i++)
{
if (
(((ewin->desktop == lst[i]->desktop)
&& !(lst[i]->iconified)) || (lst[i]->sticky))
&& (!(lst[i]->floating)) && (lst[i] != ewin)
&& (lst[i]->never_use_area)
&& SPANS_COMMON(ewin->x, ewin->w, lst[i]->x,
lst[i]->w))
(((ewin->desktop == lst[i]->desktop)
&& !(lst[i]->iconified)) || (lst[i]->sticky))
&& (!(lst[i]->floating)) && (lst[i] != ewin)
&& (lst[i]->never_use_area)
&& 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))
@ -294,12 +294,12 @@ MaxWidth(EWin * ewin, char *resize_type)
for (i = 0; i < num; i++)
{
if (
(((ewin->desktop == lst[i]->desktop)
&& !(lst[i]->iconified)) || (lst[i]->sticky))
&& (!(lst[i]->floating)) && (lst[i] != ewin)
&& (!(lst[i]->ignorearrange))
&& SPANS_COMMON(ewin->y, ewin->h, lst[i]->y,
lst[i]->h))
(((ewin->desktop == lst[i]->desktop)
&& !(lst[i]->iconified)) || (lst[i]->sticky))
&& (!(lst[i]->floating)) && (lst[i] != ewin)
&& (!(lst[i]->ignorearrange))
&& 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))
@ -379,7 +379,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))
@ -506,12 +506,12 @@ MaxSize(EWin * ewin, char *resize_type)
for (i = 0; i < num; i++)
{
if (
(((ewin->desktop == lst[i]->desktop)
&& !(lst[i]->iconified)) || (lst[i]->sticky))
&& (!(lst[i]->floating)) && (lst[i] != ewin)
&& (!(lst[i]->ignorearrange))
&& SPANS_COMMON(ewin->x, ewin->w, lst[i]->x,
lst[i]->w))
(((ewin->desktop == lst[i]->desktop)
&& !(lst[i]->iconified)) || (lst[i]->sticky))
&& (!(lst[i]->floating)) && (lst[i] != ewin)
&& (!(lst[i]->ignorearrange))
&& 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))
@ -623,14 +623,14 @@ MaxSize(EWin * ewin, char *resize_type)
for (i = 0; i < num; i++)
{
if (
((lst[i] != ewin) && (!(lst[i]->ignorearrange))
&& !(lst[i]->iconified)) && (!(lst[i]->floating))
&&
(((ewin->desktop
== lst[i]->desktop) && (lst[i]->fixedpos))
|| (lst[i]->sticky))
&& SPANS_COMMON(ewin->x, ewin->w, lst[i]->x,
lst[i]->w))
((lst[i] != ewin) && (!(lst[i]->ignorearrange))
&& !(lst[i]->iconified)) && (!(lst[i]->floating))
&&
(((ewin->desktop
== lst[i]->desktop) && (lst[i]->fixedpos))
|| (lst[i]->sticky))
&& SPANS_COMMON(ewin->x, ewin->w, lst[i]->x,
lst[i]->w))
{
if (((lst[i]->y + lst[i]->h) <= y) &&
((lst[i]->y + lst[i]->h) >= y1))

3
src/snprintf.c
View File

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

5
src/startup.c
View File

@ -31,7 +31,8 @@ AddEToFile(char *file)
char *s1, *s2;
char hase = 0;
char foundwm = 0;
char *wms[] = {
char *wms[] =
{
"wmaker", "afterstep", "fvwm", "fvwm2", "twm", "mwm", "vtwm", "ctwm",
"gwm",
"mlvwm", "kwm", "olwm", "wm2", "wmx", "olvwm", "9wm", "blackbox", "awm",
@ -77,7 +78,7 @@ AddEToFile(char *file)
{
fprintf(f2, "#%s", s);
fprintf(f2,
"\n# Enlightenment inserted Execution string here\n");
"\n# Enlightenment inserted Execution string here\n");
fprintf(f2, "exec %s/enlightenment\n\n",
ENLIGHTENMENT_BIN);
foundwm = 1;

6
src/text.c
View File

@ -371,7 +371,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);
}
@ -632,7 +632,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]);
@ -734,7 +734,7 @@ TextDraw(TextClass * tclass, Window win, int active, int sticky, int state,
strncat(new_line, lines[i], (len - nuke_count) / 4);
strcat(new_line, ". . . ");
strcat(new_line,
lines[i] + ((len - nuke_count) / 4) + nuke_count);
lines[i] + ((len - nuke_count) / 4) + nuke_count);
wid =
XTextWidth16(ts->xfont, (XChar2b *) new_line,
strlen(new_line) / 2);

8
src/theme.c
View File

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

1
src/themes/configs/control.cfg
View File

@ -35,6 +35,7 @@ __CONTROL __BGN
__FOCUS_MODE __SLOPPY
__MOVE_MODE __OPAQUE
__RESIZE_MODE __BOX
__GEOMINFO_MODE __CENTER_GEOMINFO
__SOUND __OFF
__TOOLTIPS __ON
__TOOLTIP_TIMEOUT 1.5

6
src/themes/configs/definitions
View File

@ -29,6 +29,11 @@
#define __BOXSHADE 4
/* for move mode only */
#define __TRANSLUCENT 5
/* move and resize geometry display modes */
#define __NO_GEOMINFO 0
#define __CENTER_GEOMINFO 1
#define __CORNER_GEOMINFO 2
/* positioning and direction */
#define __LEFT 0
@ -96,6 +101,7 @@
#define __FOCUS_MODE 307
#define __MOVE_MODE 311
#define __RESIZE_MODE 312
#define __GEOMINFO_MODE 1371
#define __SLIDE_MODE 313
#define __SLIDE_ON_CLEANUP 314
#define __SLIDE_ON_MAP 315

35
src/tooltips.c
View File

@ -135,12 +135,13 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
int i, w = 0, h = 0, ix, iy, iw, ih, dx, dy, xx, yy;
int ww, hh, adx, ady, dist;
int headline_h = 0, headline_w = 0, icons_width =
0, labels_width = 0, double_w = 0, temp_w, temp_h;
0, labels_width = 0, double_w = 0, temp_w, temp_h;
ImlibImage *im;
char pq;
int *heights = NULL;
ImageClass *ic = NULL;
int cols[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
int cols[10] =
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
EDBUG(5, "ShowToolTip");
if (!tt)
@ -663,7 +664,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ac->list[i]->event == EVENT_DOUBLE_DOWN)
{
TextDraw(tt->tclass, tt->win, 0, 0, STATE_NORMAL, "2x",
xx + iw - double_w, y, double_w, heights[i], 17,
xx + iw - double_w, y, double_w, heights[i], 17,
0);
}
if (ac->list[i]->anybutton)
@ -682,7 +683,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
ic->norm.
normal->im),
Imlib_copy_mask(id,
ic->norm.normal->im),
ic->norm.normal->im),
x, y);
x += ic->norm.normal->im->rgb_width;
}
@ -699,7 +700,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
Imlib_copy_image(id,
ic->norm.
@ -720,7 +721,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
Imlib_copy_image(id,
ic->norm.
@ -741,7 +742,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
Imlib_copy_image(id,
ic->norm.
@ -762,7 +763,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
Imlib_copy_image(id,
ic->norm.
@ -783,7 +784,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
Imlib_copy_image(id,
ic->norm.
@ -810,7 +811,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_width,
ic->norm.normal->
im->rgb_height);
PastePixmap(disp, tt->win,
@ -834,7 +835,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_width,
ic->norm.normal->
im->rgb_height);
PastePixmap(disp, tt->win,
@ -858,7 +859,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_width,
ic->norm.normal->
im->rgb_height);
PastePixmap(disp, tt->win,
@ -882,7 +883,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_width,
ic->norm.normal->
im->rgb_height);
PastePixmap(disp, tt->win,
@ -906,7 +907,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_width,
ic->norm.normal->
im->rgb_height);
PastePixmap(disp, tt->win,
@ -930,7 +931,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_width,
ic->norm.normal->
im->rgb_height);
PastePixmap(disp, tt->win,
@ -954,7 +955,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_width,
ic->norm.normal->
im->rgb_height);
PastePixmap(disp, tt->win,
@ -978,7 +979,7 @@ ShowToolTip(ToolTip * tt, char *text, ActionClass * ac, int x, int y)
if (ic->norm.normal->im)
{
Imlib_render(id, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_width,
ic->norm.normal->
im->rgb_height);
PastePixmap(disp, tt->win,

16
src/ttfont.c
View File

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

4
src/warp.c
View File

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

2
src/windowmatch.c
View File

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