Remove obsolete USE_OLD_REMEMBER/NO_AUTO_RESPAWN stuff.
This commit is contained in:
parent
30baa4ff7c
commit
631daee134
45
api/epplet.c
45
api/epplet.c
|
@ -112,10 +112,6 @@ static Window Epplet_internal_create_window(int w, int h,
|
||||||
char decorate);
|
char decorate);
|
||||||
static void remember_stuff(void *data);
|
static void remember_stuff(void *data);
|
||||||
|
|
||||||
#if USE_OLD_REMEMBER
|
|
||||||
static int need_remember = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MWM_HINTS_DECORATIONS (1L << 1)
|
#define MWM_HINTS_DECORATIONS (1L << 1)
|
||||||
typedef struct _mwmhints
|
typedef struct _mwmhints
|
||||||
{
|
{
|
||||||
|
@ -612,11 +608,7 @@ Epplet_Init(char *name,
|
||||||
|
|
||||||
wmDeleteWindow = XInternAtom(disp, "WM_DELETE_WINDOW", False);
|
wmDeleteWindow = XInternAtom(disp, "WM_DELETE_WINDOW", False);
|
||||||
|
|
||||||
#if USE_OLD_REMEMBER
|
|
||||||
Epplet_timer(remember_stuff, NULL, 10, "REMEMBER_TIMER");
|
|
||||||
#else
|
|
||||||
Epplet_timer(remember_stuff, NULL, 2, "REMEMBER_TIMER");
|
Epplet_timer(remember_stuff, NULL, 2, "REMEMBER_TIMER");
|
||||||
#endif
|
|
||||||
|
|
||||||
sa.sa_handler = Epplet_handle_child;
|
sa.sa_handler = Epplet_handle_child;
|
||||||
sa.sa_flags = SA_RESTART;
|
sa.sa_flags = SA_RESTART;
|
||||||
|
@ -984,14 +976,7 @@ Epplet_handle_delete_event(Window xwin)
|
||||||
static void
|
static void
|
||||||
remember_stuff(void *data)
|
remember_stuff(void *data)
|
||||||
{
|
{
|
||||||
#if USE_OLD_REMEMBER
|
|
||||||
if (need_remember)
|
|
||||||
Epplet_remember();
|
|
||||||
need_remember = 0;
|
|
||||||
Epplet_timer(remember_stuff, NULL, 10, "REMEMBER_TIMER");
|
|
||||||
#else
|
|
||||||
Epplet_remember();
|
Epplet_remember();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -1035,29 +1020,8 @@ Epplet_remember(void)
|
||||||
{
|
{
|
||||||
char s[1024];
|
char s[1024];
|
||||||
|
|
||||||
#if USE_OLD_REMEMBER
|
|
||||||
Esnprintf(s, sizeof(s), "remember %x none", (unsigned int)mainwin->win);
|
|
||||||
ECommsSend(s);
|
|
||||||
Esnprintf(s, sizeof(s), "remember %x layer", (unsigned int)mainwin->win);
|
|
||||||
ECommsSend(s);
|
|
||||||
Esnprintf(s, sizeof(s), "remember %x border", (unsigned int)mainwin->win);
|
|
||||||
ECommsSend(s);
|
|
||||||
Esnprintf(s, sizeof(s), "remember %x location", (unsigned int)mainwin->win);
|
|
||||||
ECommsSend(s);
|
|
||||||
Esnprintf(s, sizeof(s), "remember %x sticky", (unsigned int)mainwin->win);
|
|
||||||
ECommsSend(s);
|
|
||||||
Esnprintf(s, sizeof(s), "remember %x shade", (unsigned int)mainwin->win);
|
|
||||||
ECommsSend(s);
|
|
||||||
Esnprintf(s, sizeof(s), "remember %x group", (unsigned int)mainwin->win);
|
|
||||||
ECommsSend(s);
|
|
||||||
#ifndef NO_AUTO_RESPAWN
|
|
||||||
Esnprintf(s, sizeof(s), "remember %x command", (unsigned int)mainwin->win);
|
|
||||||
ECommsSend(s);
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
Esnprintf(s, sizeof(s), "wop %x snap all auto", (unsigned int)mainwin->win);
|
Esnprintf(s, sizeof(s), "wop %x snap all auto", (unsigned int)mainwin->win);
|
||||||
ECommsSend(s);
|
ECommsSend(s);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -1674,15 +1638,6 @@ Epplet_prune_events(XEvent * ev, int num)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if USE_OLD_REMEMBER
|
|
||||||
/* any reason to remember the window properties? */
|
|
||||||
for (i = 0; i < num; i++)
|
|
||||||
if (((ev[i].type == ConfigureNotify)
|
|
||||||
&& (ev->xconfigure.window == mainwin->win))
|
|
||||||
|| ((ev[i].type == PropertyNotify)
|
|
||||||
&& (ev->xproperty.window == mainwin->win)))
|
|
||||||
need_remember = 1;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
14
configure.ac
14
configure.ac
|
@ -121,20 +121,6 @@ fi
|
||||||
AC_SUBST(GTLIBS)
|
AC_SUBST(GTLIBS)
|
||||||
|
|
||||||
|
|
||||||
AC_ARG_ENABLE(auto-respawn,
|
|
||||||
[ --disable-auto-respawn don't respawn epplets through e by default @<:@default=no@:>@],
|
|
||||||
no_respawn=yes,)
|
|
||||||
if test ! -z "$no_respawn"; then
|
|
||||||
AC_DEFINE(NO_AUTO_RESPAWN, 1, [Disable auto-respawning])
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_ARG_ENABLE(old-remember,
|
|
||||||
[ --enable-old-remember use if you have a version of enlightenment < 0.16.8 @<:@default=no@:>@],
|
|
||||||
enable_old_remember=no)
|
|
||||||
if test "x$enable_old_remember" = "xno"; then
|
|
||||||
AC_DEFINE(USE_OLD_REMEMBER, 1, [Use old remember mode (e16 < 0.16.8)])
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# Build test programs?
|
# Build test programs?
|
||||||
AC_ARG_WITH(test-programs,
|
AC_ARG_WITH(test-programs,
|
||||||
|
|
Loading…
Reference in New Issue