enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

update wl_x11 and wl_desktop_shell for new compositor 

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2014-05-09 10:53:53 +01:00
parent 434219f758
commit f031705442
4 changed files with 105 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/Makefile_wl_desktop_shell.mk
View File

@ -1,7 +1,6 @@
EXTRA_DIST += src/modules/wl_desktop_shell/module.desktop.in \
src/modules/wl_desktop_shell/e-module-wl_desktop_shell.edj \
src/modules/wl_desktop_shell/module.desktop.in \
src/modules/wl_desktop_shell/e-desktop-shell.xml \
src/modules/wl_desktop_shell/e_desktop_shell_protocol.h \
src/modules/wl_desktop_shell/e_desktop_shell_protocol.c
if USE_MODULE_WL_DESKTOP_SHELL
@ -17,10 +16,10 @@ src_modules_wl_desktop_shell_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WL_DESKTOP_S
src_modules_wl_desktop_shell_module_la_LIBADD = $(LIBS) @WL_DESKTOP_SHELL_LIBS@ @WAYLAND_LIBS@
src_modules_wl_desktop_shell_module_la_LDFLAGS = $(MOD_LDFLAGS)
src_modules_wl_desktop_shell_module_la_SOURCES = src/modules/wl_desktop_shell/e_mod_main.c \
src/modules/wl_desktop_shell/e_mod_main.h \
src/modules/wl_desktop_shell/e_desktop_shell_protocol.c
src/modules/wl_desktop_shell/e_desktop_shell_protocol.h
src_modules_wl_desktop_shell_module_la_SOURCES = \
src/modules/wl_desktop_shell/e_mod_main.c \
src/modules/wl_desktop_shell/e_desktop_shell_protocol.c \
src/modules/wl_desktop_shell/e_desktop_shell_protocol.h
PHONIES += wl_desktop_shell install-wl_desktop_shell
wl_desktop_shell: $(wl_desktop_shellpkg_LTLIBRARIES) $(wl_desktop_shell_DATA)

11
src/modules/Makefile_wl_x11.mk
View File

@ -5,13 +5,12 @@ wl_x11pkgdir = $(MDIR)/wl_x11/$(MODULE_ARCH)
wl_x11pkg_LTLIBRARIES = src/modules/wl_x11/module.la
src_modules_wl_x11_module_la_DEPENDENCIES = $(MDEPENDENCIES)
src_modules_wl_x11_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @ECORE_X_CFLAGS@ @WAYLAND_CFLAGS@ -DNEED_X=1
src_modules_wl_x11_module_la_LIBADD = $(LIBS) @ECORE_X_LIBS@ @WAYLAND_LIBS@
src_modules_wl_x11_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WAYLAND_CFLAGS@
src_modules_wl_x11_module_la_LIBADD = $(MOD_LIBS) @WAYLAND_LIBS@
src_modules_wl_x11_module_la_LDFLAGS = $(MOD_LDFLAGS)
src_modules_wl_x11_module_la_SOURCES = src/modules/wl_x11/e_mod_main.c
# TODO: incomplete
#.PHONY: wl_x11 install-wl_x11
#wl_x11: $(wl_x11pkg_LTLIBRARIES) $(wl_x11_DATA)
#install-wl_x11: install-wl_x11DATA install-wl_x11pkgLTLIBRARIES
PHONIES += wl_x11 install-wl_x11
wl_x11: $(wl_x11pkg_LTLIBRARIES) $(wl_x11_DATA)
install-wl_x11: install-wl_x11DATA install-wl_x11pkgLTLIBRARIES
endif

25
src/modules/wl_drm/e_mod_main.c
View File

@ -1,7 +1,7 @@
#include "e.h"
#include <Ecore_Drm.h>
#include "e_comp_wl.h"
#include <Ecore_Wayland.h>
#include <Ecore_Drm.h>
//#include <Ecore_Wayland.h>
#define SCREEN_WIDTH 1920
#define SCREEN_HEIGHT 1200
@ -31,6 +31,8 @@ e_modapi_init(E_Module *m)
return NULL;
}
/* TODO: hook ecore_evas_callback_resize_set */
if (!e_xinerama_fake_screens_exist())
{
E_Screen *screen;
@ -43,14 +45,19 @@ e_modapi_init(E_Module *m)
screen->h = SCREEN_HEIGHT;
e_xinerama_screens_set(eina_list_append(NULL, screen));
}
comp->man = e_manager_new(0, comp, SCREEN_WIDTH, SCREEN_HEIGHT);
if (!e_comp_wl_init()) return NULL;
e_comp_canvas_init(comp);
e_comp_canvas_fake_layers_init(comp);
comp->pointer = e_pointer_canvas_new(comp->evas, 1);
ecore_wl_server_mode_set(1);
ecore_wl_init(NULL);
comp->man = e_manager_new(0, comp, SCREEN_WIDTH, SCREEN_HEIGHT);
if (!e_comp_canvas_init(comp)) return NULL;
e_comp_canvas_fake_layers_init(comp);
/* NB: This needs to be called AFTER the comp canvas has been setup */
if (!e_comp_wl_init()) return NULL;
e_comp_wl_input_pointer_enabled_set(comp->comp_data, EINA_TRUE);
e_comp_wl_input_keyboard_enabled_set(comp->comp_data, EINA_TRUE);
comp->pointer = e_pointer_canvas_new(comp->evas, 1);
comp->pointer->color = 1;
return m;
}

104
src/modules/wl_x11/e_mod_main.c
View File

@ -1,19 +1,72 @@
#include "e.h"
#include "e_comp_wl.h"
#include <Ecore_Wayland.h>
#include "e_comp_wl_input.h"
#include <Ecore_X.h>
EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_X11" };
#define SCREEN_W 1024
#define SCREEN_H 768
EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_X11" };
static Ecore_Event_Handler *kbd_hdlr;
static void
_cb_delete_request(Ecore_Evas *ee EINA_UNUSED)
{
ecore_main_loop_quit();
}
static Eina_Bool
_cb_keymap_changed(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
{
E_Comp_Data *cdata;
E_Config_XKB_Layout *ekbd;
char *rules, *model, *layout;
Ecore_X_Atom xkb = 0;
Ecore_X_Window root = 0;
int len = 0;
unsigned char *dat;
printf("KEYMAP CHANGED\n");
if (!(cdata = data)) return ECORE_CALLBACK_PASS_ON;
/* try to fetch the E keyboard layout */
if ((ekbd = e_xkb_layout_get()))
{
model = strdup(ekbd->model);
layout = strdup(ekbd->name);
}
/* NB: we need a 'rules' so fetch from X atoms */
root = ecore_x_window_root_first_get();
xkb = ecore_x_atom_get("_XKB_RULES_NAMES");
ecore_x_window_prop_property_get(root, xkb, ECORE_X_ATOM_STRING,
1024, &dat, &len);
if ((data) && (len > 0))
{
rules = (char *)dat;
dat += strlen((const char *)dat) + 1;
if (!model) model = strdup((const char *)dat);
dat += strlen((const char *)dat) + 1;
if (!layout) layout = strdup((const char *)dat);
}
/* fallback */
if (!rules) rules = strdup("evdev");
if (!model) model = strdup("pc105");
if (!layout) layout = strdup("us");
/* update compositor keymap */
e_comp_wl_input_keymap_set(cdata, rules, model, layout);
free(rules);
free(model);
free(layout);
return ECORE_CALLBACK_PASS_ON;
}
EAPI void *
e_modapi_init(E_Module *m)
{
@ -23,14 +76,9 @@ e_modapi_init(E_Module *m)
printf("LOAD WL_X11 MODULE\n");
/* try to init ecore_x */
if (!ecore_x_init(NULL))
{
fprintf(stderr, "Could not initialize ecore_x\n");
return NULL;
}
ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, SCREEN_W, SCREEN_H);
ecore_evas_callback_delete_request_set(ee, _cb_delete_request);
comp = e_comp_new();
comp->comp_type = E_PIXMAP_TYPE_WL;
comp->ee = ee;
@ -44,30 +92,38 @@ e_modapi_init(E_Module *m)
screen->h = SCREEN_H;
e_xinerama_screens_set(eina_list_append(NULL, screen));
}
comp->man = e_manager_new(0, comp, SCREEN_W, SCREEN_H);
e_comp_wl_init();
e_comp_canvas_init(comp);
e_comp_canvas_fake_layers_init(comp);
comp->pointer = e_pointer_canvas_new(comp->evas, 1);
ecore_evas_callback_delete_request_set(ee, _cb_delete_request);
comp->man = e_manager_new(0, comp, SCREEN_W, SCREEN_H);
if (!e_comp_canvas_init(comp)) return NULL;
e_comp_canvas_fake_layers_init(comp);
/* NB: This needs to be called AFTER comp_canvas has been setup as it
* makes reference to the comp->evas */
if (!e_comp_wl_init()) return NULL;
e_comp_wl_input_pointer_enabled_set(comp->comp_data, EINA_TRUE);
e_comp_wl_input_keyboard_enabled_set(comp->comp_data, EINA_TRUE);
comp->pointer =
e_pointer_window_new(ecore_evas_window_get(comp->ee), 1);
/* comp->pointer = e_pointer_canvas_new(comp->evas, 1); */
/* force a keymap update so compositor keyboard gets setup */
_cb_keymap_changed(comp->comp_data, 0, NULL);
/* setup keymap_change event handler */
if (!_e_wl_comp->kbd_handler)
_e_wl_comp->kbd_handler =
ecore_event_handler_add(ECORE_X_EVENT_XKB_STATE_NOTIFY,
e_comp_wl_cb_keymap_changed, NULL);
kbd_hdlr =
ecore_event_handler_add(ECORE_X_EVENT_XKB_STATE_NOTIFY,
_cb_keymap_changed, comp->comp_data);
ecore_wl_init(NULL);
ecore_wl_server_mode_set(1);
return m;
}
EAPI int
e_modapi_shutdown(E_Module *m EINA_UNUSED)
{
/* shutdown ecore_x */
ecore_x_shutdown();
/* delete handler for keymap change */
if (kbd_hdlr) ecore_event_handler_del(kbd_hdlr);
return 1;
}