disable ehack... grrr

add winlist stubs


SVN revision: 15175
This commit is contained in:
Carsten Haitzler 2005-06-07 13:05:18 +00:00
parent 94832aed58
commit 37a128d64c
6 changed files with 70 additions and 6 deletions

View File

@ -57,7 +57,8 @@ e_popup.h \
e_ipc_codec.h \
e_prefix.h \
e_datastore.h \
e_msg.h
e_msg.h \
e_winlist.h
enlightenment_SOURCES = \
e_main.c \
@ -106,6 +107,7 @@ e_ipc_codec.c \
e_prefix.c \
e_datastore.c \
e_msg.c \
e_winlist.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_LDFLAGS = -export-dynamic @e_libs@ @dlopen_libs@

View File

@ -46,3 +46,4 @@
#include "e_prefix.h"
#include "e_datastore.h"
#include "e_msg.h"
#include "e_winlist.h"

View File

@ -390,7 +390,7 @@ main(int argc, char **argv)
else
_e_main_shutdown_push(_e_main_ipc_shutdown);
/* setup module loading etc */
/* setup generic msg handling etc */
if (!e_msg_init())
{
e_error_message_show(_("Enlightenment cannot set up its msg system."));
@ -404,7 +404,6 @@ main(int argc, char **argv)
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_module_shutdown);
/* setup dnd */
if (!e_dnd_init())
{
@ -412,6 +411,13 @@ main(int argc, char **argv)
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_dnd_shutdown);
/* setup winlist */
if (!e_winlist_init())
{
e_error_message_show(_("Enlightenment cannot set up its window list system."));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_winlist_shutdown);
if (ipc_failed)
e_error_dialog_show(_("Enlightenment IPC setup error!"),

32
src/bin/e_winlist.c Normal file
View File

@ -0,0 +1,32 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#include "e.h"
/* local subsystem functions */
/* local subsystem globals */
/* externally accessible functions */
int
e_winlist_init(void)
{
return 1;
}
int
e_winlist_shutdown(void)
{
return 1;
}
/*
* how to handle? on show, grab keyboard (and mouse) like menus
* set "modifier keys active" if spawning event had modfiers active
* if "modifier keys active" and if all modifier keys are released or is found not active on start = end
* up/left == prev
* down/right == next
* escape = end
* 1 - 9, 0 = select window 1 - 9, 10
* local subsystem functions
*/

20
src/bin/e_winlist.h Normal file
View File

@ -0,0 +1,20 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef E_TYPEDEFS
#else
#ifndef E_WINLIST_H
#define E_WINLIST_H
EAPI int e_winlist_init(void);
EAPI int e_winlist_shutdown(void);
EAPI void e_winlist_show(void);
EAPI void e_winlist_hide(void);
EAPI void e_winlist_next(void);
EAPI void e_winlist_prev(void);
EAPI void e_winlist_modifiers_set(int mod);
#endif
#endif

View File

@ -496,6 +496,7 @@ e_zone_app_exec(E_Zone *zone, E_App *a)
else
strcpy(buf, penv_display);
e_util_env_set("DISPLAY", buf);
/*
snprintf(buf, sizeof(buf), "%i %i", zone->desk_x_current, zone->desk_y_current);
e_util_env_set("E_DESK", buf);
snprintf(buf, sizeof(buf), "%i", zone->num);
@ -504,11 +505,11 @@ e_zone_app_exec(E_Zone *zone, E_App *a)
e_util_env_set("E_CONTAINER", buf);
snprintf(buf, sizeof(buf), "%i", zone->container->manager->num);
e_util_env_set("E_MANAGER", buf);
e_util_env_set("LD_PRELOAD_PATH", PACKAGE_LIB_DIR"/enlightenment/preload");
e_util_env_set("LD_PRELOAD", PACKAGE_LIB_DIR"/enlightenment/preload/e_hack.so");
snprintf(buf, sizeof(buf), "%i", launch_id);
e_util_env_set("E_LAUNCH_ID", buf);
e_util_env_set("LD_PRELOAD_PATH", PACKAGE_LIB_DIR"/enlightenment/preload");
e_util_env_set("LD_PRELOAD", PACKAGE_LIB_DIR"/enlightenment/preload/e_hack.so");
*/
launch_id++;
if (launch_id == 0) launch_id = 1;
/* execute */
@ -520,6 +521,7 @@ e_zone_app_exec(E_Zone *zone, E_App *a)
e_util_env_set("DISPLAY", penv_display);
free(penv_display);
}
/*
if (penv_ld_preload)
{
e_util_env_set("LD_PRELOAD", penv_ld_preload);
@ -530,6 +532,7 @@ e_zone_app_exec(E_Zone *zone, E_App *a)
e_util_env_set("LD_PRELOAD_PATH", penv_ld_preload_path);
free(penv_ld_preload_path);
}
*/
return launch_id;
}