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

HAVE_WAYLAND_CLIENTS || HAVE_WAYLAND_ONLY -> HAVE_WAYLAND 

these are semantically identical
This commit is contained in:
Mike Blumenkrantz 2015-06-25 18:49:00 -04:00
parent 972b003163
commit 2ae8d726f3
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e.h
View File

@ -126,7 +126,7 @@ void *alloca (size_t);
# include <Emotion.h> # include <Emotion.h>
# include <Elementary.h> # include <Elementary.h>
# if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) # ifdef HAVE_WAYLAND
# include <Ecore_Wayland.h> # include <Ecore_Wayland.h>
# include <uuid.h> # include <uuid.h>
# endif # endif

2
src/bin/e_client.h
View File

@ -697,7 +697,7 @@ struct E_Client
Eina_Bool no_shape_cut : 1; // client shape should not be cut Eina_Bool no_shape_cut : 1; // client shape should not be cut
Eina_Bool maximize_override : 1; // client is doing crazy stuff and should "just do it" when moving/resizing Eina_Bool maximize_override : 1; // client is doing crazy stuff and should "just do it" when moving/resizing
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
uuid_t uuid; uuid_t uuid;
#endif #endif
}; };

2
src/bin/e_comp.c
View File

@ -1,5 +1,5 @@
#include "e.h" #include "e.h"
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
# include "e_comp_wl.h" # include "e_comp_wl.h"
#endif #endif

2
src/bin/e_includes.h
View File

@ -150,7 +150,7 @@
#include "e_hints.h" #include "e_hints.h"
#include "e_comp_x_randr.h" #include "e_comp_x_randr.h"
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
# include "e_comp_wl.h" # include "e_comp_wl.h"
# include "e_comp_wl_data.h" # include "e_comp_wl_data.h"
# include "e_comp_wl_input.h" # include "e_comp_wl_input.h"

46
src/bin/e_pixmap.c
View File

@ -1,6 +1,6 @@
#include "e.h" #include "e.h"
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
# include "e_comp_wl.h" # include "e_comp_wl.h"
#endif #endif
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY
@ -31,7 +31,7 @@ struct _E_Pixmap
Eina_List *images_cache; Eina_List *images_cache;
#endif #endif
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
E_Comp_Wl_Buffer_Ref buffer_ref; E_Comp_Wl_Buffer_Ref buffer_ref;
struct wl_listener buffer_destroy_listener; struct wl_listener buffer_destroy_listener;
void *data; void *data;
@ -43,7 +43,7 @@ struct _E_Pixmap
Eina_Bool image_argb : 1; Eina_Bool image_argb : 1;
}; };
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
static void static void
_e_pixmap_cb_buffer_destroy(struct wl_listener *listener, void *data EINA_UNUSED) _e_pixmap_cb_buffer_destroy(struct wl_listener *listener, void *data EINA_UNUSED)
{ {
@ -74,7 +74,7 @@ _e_pixmap_clear(E_Pixmap *cp, Eina_Bool cache)
#endif #endif
break; break;
case E_PIXMAP_TYPE_WL: case E_PIXMAP_TYPE_WL:
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
if (cp->buffer_destroy_listener.notify) if (cp->buffer_destroy_listener.notify)
{ {
wl_list_remove(&cp->buffer_destroy_listener.link); wl_list_remove(&cp->buffer_destroy_listener.link);
@ -120,7 +120,7 @@ _e_pixmap_free(E_Pixmap *cp)
#endif #endif
break; break;
case E_PIXMAP_TYPE_WL: case E_PIXMAP_TYPE_WL:
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
#endif #endif
break; break;
default: default:
@ -149,7 +149,7 @@ _e_pixmap_find(E_Pixmap_Type type, va_list *l)
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY
Ecore_X_Window xwin; Ecore_X_Window xwin;
#endif #endif
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
uintptr_t id; uintptr_t id;
#endif #endif
@ -163,7 +163,7 @@ _e_pixmap_find(E_Pixmap_Type type, va_list *l)
#endif #endif
break; break;
case E_PIXMAP_TYPE_WL: case E_PIXMAP_TYPE_WL:
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
id = va_arg(*l, uintptr_t); id = va_arg(*l, uintptr_t);
return eina_hash_find(pixmaps[type], &id); return eina_hash_find(pixmaps[type], &id);
#endif #endif
@ -199,7 +199,7 @@ e_pixmap_new(E_Pixmap_Type type, ...)
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY
Ecore_X_Window xwin; Ecore_X_Window xwin;
#endif #endif
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
uintptr_t id; uintptr_t id;
#endif #endif
@ -227,7 +227,7 @@ e_pixmap_new(E_Pixmap_Type type, ...)
#endif #endif
break; break;
case E_PIXMAP_TYPE_WL: case E_PIXMAP_TYPE_WL:
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
id = va_arg(l, uintptr_t); id = va_arg(l, uintptr_t);
if (pixmaps[type]) if (pixmaps[type])
{ {
@ -387,7 +387,7 @@ e_pixmap_refresh(E_Pixmap *cp)
#endif #endif
break; break;
case E_PIXMAP_TYPE_WL: case E_PIXMAP_TYPE_WL:
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
success = ((cp->w > 0) && (cp->h > 0)); success = ((cp->w > 0) && (cp->h > 0));
#endif #endif
break; break;
@ -486,7 +486,7 @@ e_pixmap_resource_get(E_Pixmap *cp)
CRI("ACK"); CRI("ACK");
return NULL; return NULL;
} }
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
return cp->buffer_ref.buffer; return cp->buffer_ref.buffer;
#endif #endif
return NULL; return NULL;
@ -496,7 +496,7 @@ E_API void
e_pixmap_resource_set(E_Pixmap *cp, void *resource) e_pixmap_resource_set(E_Pixmap *cp, void *resource)
{ {
if ((!cp) || (cp->type != E_PIXMAP_TYPE_WL)) return; if ((!cp) || (cp->type != E_PIXMAP_TYPE_WL)) return;
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
{ {
E_Comp_Wl_Buffer *buffer; E_Comp_Wl_Buffer *buffer;
struct wl_shm_buffer *shm_buffer; struct wl_shm_buffer *shm_buffer;
@ -575,7 +575,7 @@ e_pixmap_native_surface_init(E_Pixmap *cp, Evas_Native_Surface *ns)
#endif #endif
break; break;
case E_PIXMAP_TYPE_WL: case E_PIXMAP_TYPE_WL:
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
ns->type = EVAS_NATIVE_SURFACE_OPENGL; ns->type = EVAS_NATIVE_SURFACE_OPENGL;
ns->version = EVAS_NATIVE_SURFACE_VERSION; ns->version = EVAS_NATIVE_SURFACE_VERSION;
ns->data.opengl.texture_id = 0; ns->data.opengl.texture_id = 0;
@ -631,7 +631,7 @@ e_pixmap_image_clear(E_Pixmap *cp, Eina_Bool cache)
#endif #endif
break; break;
case E_PIXMAP_TYPE_WL: case E_PIXMAP_TYPE_WL:
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
if (cache) if (cache)
{ {
E_Comp_Wl_Client_Data *cd; E_Comp_Wl_Client_Data *cd;
@ -680,7 +680,7 @@ e_pixmap_image_refresh(E_Pixmap *cp)
#endif #endif
break; break;
case E_PIXMAP_TYPE_WL: case E_PIXMAP_TYPE_WL:
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
/* FIXME */ /* FIXME */
return EINA_TRUE; return EINA_TRUE;
#endif #endif
@ -701,7 +701,7 @@ e_pixmap_image_exists(const E_Pixmap *cp)
if (cp->type == E_PIXMAP_TYPE_X) if (cp->type == E_PIXMAP_TYPE_X)
return !!cp->image; return !!cp->image;
#endif #endif
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
return (cp->buffer_ref.buffer != NULL); return (cp->buffer_ref.buffer != NULL);
#endif #endif
@ -720,7 +720,7 @@ e_pixmap_image_is_argb(const E_Pixmap *cp)
return cp->image && cp->image_argb; return cp->image && cp->image_argb;
#endif #endif
case E_PIXMAP_TYPE_WL: case E_PIXMAP_TYPE_WL:
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
return ((cp->buffer_ref.buffer != NULL) && (cp->image_argb)); return ((cp->buffer_ref.buffer != NULL) && (cp->image_argb));
#endif #endif
default: break; default: break;
@ -742,7 +742,7 @@ e_pixmap_image_data_get(E_Pixmap *cp)
#endif #endif
break; break;
case E_PIXMAP_TYPE_WL: case E_PIXMAP_TYPE_WL:
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
return cp->data; return cp->data;
#endif #endif
break; break;
@ -772,7 +772,7 @@ e_pixmap_image_data_argb_convert(E_Pixmap *cp, void *pix, void *ipix, Eina_Recta
break; break;
case E_PIXMAP_TYPE_WL: case E_PIXMAP_TYPE_WL:
if (cp->image_argb) return EINA_TRUE; if (cp->image_argb) return EINA_TRUE;
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
if (cp->buffer_ref.buffer) if (cp->buffer_ref.buffer)
{ {
struct wl_shm_buffer *shm_buffer; struct wl_shm_buffer *shm_buffer;
@ -822,7 +822,7 @@ e_pixmap_image_draw(E_Pixmap *cp, const Eina_Rectangle *r)
#endif #endif
break; break;
case E_PIXMAP_TYPE_WL: case E_PIXMAP_TYPE_WL:
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
#endif #endif
(void) r; (void) r;
return EINA_TRUE; return EINA_TRUE;
@ -837,7 +837,7 @@ e_pixmap_image_draw_done(E_Pixmap *cp)
{ {
EINA_SAFETY_ON_NULL_RETURN(cp); EINA_SAFETY_ON_NULL_RETURN(cp);
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
struct wl_shm_buffer *shm_buffer; struct wl_shm_buffer *shm_buffer;
shm_buffer = wl_shm_buffer_get(cp->buffer_ref.buffer->resource); shm_buffer = wl_shm_buffer_get(cp->buffer_ref.buffer->resource);
@ -851,7 +851,7 @@ E_API void
e_pixmap_image_opaque_set(E_Pixmap *cp, int x, int y, int w, int h) e_pixmap_image_opaque_set(E_Pixmap *cp, int x, int y, int w, int h)
{ {
EINA_SAFETY_ON_NULL_RETURN(cp); EINA_SAFETY_ON_NULL_RETURN(cp);
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
EINA_RECTANGLE_SET(&cp->opaque, x, y, w, h); EINA_RECTANGLE_SET(&cp->opaque, x, y, w, h);
#else #else
(void)x; (void)x;
@ -865,7 +865,7 @@ E_API void
e_pixmap_image_opaque_get(E_Pixmap *cp, int *x, int *y, int *w, int *h) e_pixmap_image_opaque_get(E_Pixmap *cp, int *x, int *y, int *w, int *h)
{ {
EINA_SAFETY_ON_NULL_RETURN(cp); EINA_SAFETY_ON_NULL_RETURN(cp);
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) #ifdef HAVE_WAYLAND
if (x) *x = cp->opaque.x; if (x) *x = cp->opaque.x;
if (y) *y = cp->opaque.y; if (y) *y = cp->opaque.y;
if (w) *w = cp->opaque.w; if (w) *w = cp->opaque.w;