enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

fix evry build on wayland-only

This commit is contained in:
Mike Blumenkrantz 2015-01-22 14:59:10 -05:00
parent ba684aacd3
commit 7e0152e384
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/Makefile_everything.mk
View File

@ -31,6 +31,7 @@ src_modules_everything_module_la_SOURCES = $(EVRYHEADERS) \
src/modules/everything/evry_view_tabs.c \ src/modules/everything/evry_view_tabs.c \
src/modules/everything/evry_view_help.c \ src/modules/everything/evry_view_help.c \
src/modules/everything/evry_plug_text.c \ src/modules/everything/evry_plug_text.c \
src/modules/everything/evry_plug_clipboard.c
src/modules/everything/evry_plug_collection.c \ src/modules/everything/evry_plug_collection.c \
src/modules/everything/evry_gadget.c \ src/modules/everything/evry_gadget.c \
src/modules/everything/md5.c \ src/modules/everything/md5.c \
@ -41,10 +42,6 @@ src_modules_everything_module_la_SOURCES = $(EVRYHEADERS) \
src/modules/everything/evry_plug_settings.c \ src/modules/everything/evry_plug_settings.c \
src/modules/everything/evry_plug_calc.c src/modules/everything/evry_plug_calc.c
if ! HAVE_WAYLAND_ONLY
src_modules_everything_module_la_SOURCES += src/modules/everything/evry_plug_clipboard.c
endif
everything_headersdir = $(pkgincludedir) everything_headersdir = $(pkgincludedir)
dist_everything_headers_DATA = $(EVRYHEADERS) dist_everything_headers_DATA = $(EVRYHEADERS)

22
src/modules/everything/evry_plug_clipboard.c
View File

@ -1,18 +1,18 @@
#include "e_mod_main.h" #include "e_mod_main.h"
#ifndef HAVE_WAYLAND_ONLY
static Evry_Action *act; static Evry_Action *act;
static Ecore_X_Window clipboard_win = 0; static Ecore_Window clipboard_win = 0;
static int static int
_action(Evry_Action *action) _action(Evry_Action *action)
{ {
const Evry_Item *it = action->it1.item; const Evry_Item *it;
if (e_comp_get(NULL)->comp_type != E_PIXMAP_TYPE_X) return 0;
if (e_comp->comp_type != E_PIXMAP_TYPE_X) return 0;
it = action->it1.item;
ecore_x_selection_primary_set(clipboard_win, it->label, strlen(it->label)); ecore_x_selection_primary_set(clipboard_win, it->label, strlen(it->label));
ecore_x_selection_clipboard_set(clipboard_win, it->label, strlen(it->label)); ecore_x_selection_clipboard_set(clipboard_win, it->label, strlen(it->label));
return 1; return 1;
} }
@ -21,17 +21,18 @@ _check_item(Evry_Action *action __UNUSED__, const Evry_Item *it)
{ {
return it && it->label && (strlen(it->label) > 0); return it && it->label && (strlen(it->label) > 0);
} }
#endif
Eina_Bool Eina_Bool
evry_plug_clipboard_init(void) evry_plug_clipboard_init(void)
{ {
Ecore_X_Window win; Ecore_Window win;
if (!evry_api_version_check(EVRY_API_VERSION)) if (!evry_api_version_check(EVRY_API_VERSION))
return EINA_FALSE; return EINA_FALSE;
if (e_comp_get(NULL)->comp_type != E_PIXMAP_TYPE_X) if (e_comp->comp_type != E_PIXMAP_TYPE_X)
return EINA_FALSE; return EINA_FALSE;
#ifndef HAVE_WAYLAND_ONLY
win = ecore_x_window_input_new(0, 0, 0, 1, 1); win = ecore_x_window_input_new(0, 0, 0, 1, 1);
if (!win) return EINA_FALSE; if (!win) return EINA_FALSE;
ecore_x_icccm_name_class_set(win, "evry", "clipboard"); ecore_x_icccm_name_class_set(win, "evry", "clipboard");
@ -48,13 +49,16 @@ evry_plug_clipboard_init(void)
clipboard_win = win; clipboard_win = win;
return EINA_TRUE; return EINA_TRUE;
#endif
} }
void void
evry_plug_clipboard_shutdown(void) evry_plug_clipboard_shutdown(void)
{ {
if (e_comp_get(NULL)->comp_type != E_PIXMAP_TYPE_X) return; if (e_comp->comp_type != E_PIXMAP_TYPE_X) return;
#ifndef HAVE_WAYLAND_ONLY
ecore_x_window_free(clipboard_win); ecore_x_window_free(clipboard_win);
evry_action_free(act); evry_action_free(act);
#endif
} }