cleaned up code - now there arent any warnings anymore :)
SVN revision: 71
This commit is contained in:
parent
6812afbef3
commit
ecbed1e705
3
src/E.h
3
src/E.h
|
@ -2514,6 +2514,7 @@ void SnapshotEwinIcon(EWin * ewin);
|
|||
void SnapshotEwinShade(EWin * ewin);
|
||||
void SnapshotEwinCmd(EWin * ewin);
|
||||
void SnapshotEwinAllInstances(EWin * ewin, char onoff);
|
||||
void SnapshotEwinGroup(EWin * ewin, char onoff);
|
||||
void SnapshotEwinAll(EWin * ewin);
|
||||
void UnsnapshotEwin(EWin * ewin);
|
||||
void SaveSnapInfo(void);
|
||||
|
@ -2720,6 +2721,8 @@ void BreakWindowGroup(EWin * ewin);
|
|||
void BuildWindowGroup(EWin ** ewins, int num);
|
||||
void AddEwinToGroup(EWin * ewin, Group * g);
|
||||
void RemoveEwinFromGroup(EWin * ewin);
|
||||
void ChooseGroupForEwinDialog(EWin * ewin);
|
||||
void FreeGroup(Group * g);
|
||||
|
||||
EWin *GetZoomEWin(void);
|
||||
void ReZoom(EWin * ewin);
|
||||
|
|
|
@ -4,7 +4,6 @@ Group *
|
|||
CreateGroup()
|
||||
{
|
||||
Group *g;
|
||||
struct timeval timev;
|
||||
|
||||
g = Emalloc(sizeof(Group));
|
||||
if (!g)
|
||||
|
|
|
@ -485,7 +485,8 @@ IPCStruct IPCArray[] =
|
|||
{
|
||||
IPC_ReloadMenus,
|
||||
"reload_menus",
|
||||
"Reload menus.cfg without restarting (Asmodean_)"
|
||||
"Reload menus.cfg without restarting (Asmodean_)",
|
||||
NULL
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -4386,4 +4387,7 @@ IPC_ReloadMenus(char *params, Client * c) {
|
|||
}
|
||||
|
||||
LoadConfigFile("menus.cfg");
|
||||
|
||||
params = NULL;
|
||||
c = NULL;
|
||||
}
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
|
||||
/* initialize all the KDE Hint Atoms */
|
||||
|
||||
#if 0 /* we dont need these right now */
|
||||
static Atom KDE_COMMAND = 0;
|
||||
static Atom KDE_ACTIVATE_WINDOW = 0;
|
||||
static Atom KDE_DO_NOT_MANAGE = 0;
|
||||
|
@ -65,6 +66,7 @@ static Atom KDE_WIN_ICONIFIED = 0;
|
|||
static Atom KDE_WIN_MAXIMIZED = 0;
|
||||
static Atom KDE_WIN_STICKY = 0;
|
||||
static Atom KDE_WIN_ICON_GEOMETRY = 0;
|
||||
#endif
|
||||
|
||||
/* the modules I have to communicate to */
|
||||
typedef struct KModuleList
|
||||
|
|
27
src/menus.c
27
src/menus.c
|
@ -300,29 +300,20 @@ ShowMenu(Menu * m, char noshow)
|
|||
GetWinWH(m->items[0]->win, &w, &h);
|
||||
GetWinWH(m->win, &mw, &mh);
|
||||
|
||||
wx = 0; wy = 0;
|
||||
if (mode.menusonscreen)
|
||||
{
|
||||
if (mode.x - x - (w / 2) > root.w)
|
||||
{
|
||||
wx = 0 + (mw - w);
|
||||
}
|
||||
else if (mode.x + w > root.w)
|
||||
{
|
||||
wx = root.w - mw - (mw - w);
|
||||
}
|
||||
if (mode.x - x - ((int)w / 2) > (int)root.w)
|
||||
wx = 0 + ((int)mw - (int)w);
|
||||
else if (mode.x + (int)w > (int)root.w)
|
||||
wx = root.w - (int)mw - ((int)mw - (int)w);
|
||||
else
|
||||
{
|
||||
wx = mode.x - x - (w / 2);
|
||||
}
|
||||
wx = mode.x - x - ((int)w / 2);
|
||||
|
||||
if (mode.y + mh > root.h)
|
||||
{
|
||||
wy = root.h - mh;
|
||||
}
|
||||
if (mode.y + (int)mh > (int)root.h)
|
||||
wy = (int)root.h - (int)mh;
|
||||
else
|
||||
{
|
||||
wy = mode.y - y - (h / 2);
|
||||
}
|
||||
wy = mode.y - y - ((int)h / 2);
|
||||
}
|
||||
|
||||
if ((mode.x >= 0) && (mode.y >= 0))
|
||||
|
|
|
@ -332,7 +332,7 @@ SnapshotEwinDialog(EWin * ewin)
|
|||
|
||||
s[0] = 0;
|
||||
slice = 80;
|
||||
while (i <= strlen(ewin->client.command))
|
||||
while (i <= (int)strlen(ewin->client.command))
|
||||
{
|
||||
last = i;
|
||||
i += 80;
|
||||
|
|
Loading…
Reference in New Issue