hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing HAVE_ELEMENTARY_X guards. 

NB: Fixes ticket T107: Building elementary with only wayland support.

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2013-05-13 12:18:24 +01:00
parent 123596ee5b
commit 76eb5c8a1b
6 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/elementary/src/lib/elm_cnp.c
View File

@ -131,6 +131,8 @@ typedef struct _Item_Container_Drag_Info Item_Container_Drag_Info;
static int _elm_cnp_init_count = 0;
/* Stringshared, so I can just compare pointers later */
static const char *text_uri;
#ifdef HAVE_ELEMENTARY_X
/* Data for DND in progress */
static Saved_Type savedtypes = { NULL, NULL, 0, 0, 0, EINA_FALSE };
@ -167,6 +169,7 @@ static Ecore_Event_Handler *handler_up = NULL;
static Tmp_Info *_tempfile_new (int size);
static int _tmpinfo_free (Tmp_Info *tmp);
static Eina_Bool _pasteimage_append (char *file, Evas_Object *entry);
#endif
//#define DEBUGON 1
#ifdef DEBUGON

4
legacy/elementary/src/lib/elm_colorselector.c
View File

@ -1539,7 +1539,9 @@ _elm_colorselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
priv->a = 255;
priv->grab.x = -1;
priv->grab.y = -1;
#ifdef HAVE_ELEMENTARY_X
priv->grab.xroot = -1;
#endif
priv->grab.in = EINA_TRUE;
_hsl_to_rgb(priv);
@ -1563,9 +1565,11 @@ _elm_colorselector_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
if (sd->longpress_timer) ecore_timer_del(sd->longpress_timer);
if (sd->palette_name) eina_stringshare_del(sd->palette_name);
#ifdef HAVE_ELEMENTARY_X
if (sd->grab.mouse_motion) ecore_event_handler_del(sd->grab.mouse_motion);
if (sd->grab.mouse_up) ecore_event_handler_del(sd->grab.mouse_up);
if (sd->grab.key_up) ecore_event_handler_del(sd->grab.key_up);
#endif
_items_del(sd);
/* This cb_data are used during the destruction process of base.del */

6
legacy/elementary/src/lib/elm_config.c
View File

@ -115,7 +115,7 @@ _prop_all_update_cb(void *data __UNUSED__)
return EINA_FALSE;
}
void
static void
_elm_font_overlays_del_free(void)
{
char *text_class;
@ -125,7 +125,7 @@ _elm_font_overlays_del_free(void)
_font_overlays_del = eina_list_free(_font_overlays_del);
}
void
static void
_elm_config_font_overlays_cancel(void)
{
Elm_Font_Overlay *efd;
@ -2541,7 +2541,9 @@ _elm_config_shutdown(void)
_elm_profile = NULL;
}
#ifdef HAVE_ELEMENTARY_X
_elm_font_overlays_del_free();
#endif
_desc_shutdown();
}

29
legacy/elementary/src/lib/elm_conform.c
View File

@ -147,18 +147,16 @@ _conformant_part_sizing_eval(Evas_Object *obj,
if (part_type & ELM_CONFORMANT_INDICATOR_PART)
{
#ifdef HAVE_ELEMENTARY_X
if ((!_conformant_part_geometry_get_from_env
("ILLUME_IND", &sx, &sy, &sw, &sh)) && (xwin))
{
#ifdef HAVE_ELEMENTARY_X
//No information of the indicator geometry, reset the geometry.
if (!ecore_x_e_illume_indicator_geometry_get
(zone, &sx, &sy, &sw, &sh))
sx = sy = sw = sh = 0;
#else
;
#endif
}
#endif
if (((sd->rot == 90) || (sd->rot == 270)) && sd->landscape_indicator)
_conformant_part_size_hints_set(obj, sd->landscape_indicator, sx, sy, sw, sh);
else if (((sd->rot == 0) || (sd->rot == 180)) && sd->portrait_indicator)
@ -167,10 +165,10 @@ _conformant_part_sizing_eval(Evas_Object *obj,
if (part_type & ELM_CONFORMANT_VIRTUAL_KEYPAD_PART)
{
#ifdef HAVE_ELEMENTARY_X
if ((!_conformant_part_geometry_get_from_env
("ILLUME_KBD", &sx, &sy, &sw, &sh)) && (xwin))
{
#ifdef HAVE_ELEMENTARY_X
//No information of the keyboard geometry, reset the geometry.
#ifdef __linux__
DBG("[KEYPAD]:pid=%d, xwin=0x%x, zone=0x%x: no env value and check window property.", getpid(), xwin, zone);
@ -184,45 +182,39 @@ _conformant_part_sizing_eval(Evas_Object *obj,
sx = sy = sw = sh = 0;
}
}
#else
;
#endif
}
DBG("[KEYPAD]: size(%d,%d, %dx%d).", sx, sy, sw, sh);
#endif
DBG("[KEYPAD]: size(%d,%d, %dx%d).", sx, sy, sw, sh);
_conformant_part_size_hints_set
(obj, sd->virtualkeypad, sx, sy, sw, sh);
}
if (part_type & ELM_CONFORMANT_SOFTKEY_PART)
{
#ifdef HAVE_ELEMENTARY_X
if ((!_conformant_part_geometry_get_from_env
("ILLUME_STK", &sx, &sy, &sw, &sh)) && (xwin))
{
#ifdef HAVE_ELEMENTARY_X
//No information of the softkey geometry, reset the geometry.
if (!ecore_x_e_illume_softkey_geometry_get
(zone, &sx, &sy, &sw, &sh))
sx = sy = sw = sh = 0;
#else
;
#endif
}
#endif
_conformant_part_size_hints_set(obj, sd->softkey, sx, sy, sw, sh);
}
if (part_type & ELM_CONFORMANT_CLIPBOARD_PART)
{
#ifdef HAVE_ELEMENTARY_X
if ((!_conformant_part_geometry_get_from_env
("ILLUME_CB", &sx, &sy, &sw, &sh)) && (xwin))
{
#ifdef HAVE_ELEMENTARY_X
//No information of the clipboard geometry, reset the geometry.
if (!ecore_x_e_illume_clipboard_geometry_get
(zone, &sx, &sy, &sw, &sh))
sx = sy = sw = sh = 0;
#else
;
#endif
}
#endif
_conformant_part_size_hints_set(obj, sd->clipboard, sx, sy, sw, sh);
}
}
@ -944,9 +936,8 @@ _elm_conformant_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
static void
_elm_conformant_smart_parent_set(Eo *obj, void *_pd, va_list *list)
{
Evas_Object *parent = va_arg(*list, Evas_Object *);
#ifdef HAVE_ELEMENTARY_X
Evas_Object *parent = va_arg(*list, Evas_Object *);
Evas_Object *top = elm_widget_top_get(parent);
Ecore_X_Window xwin = elm_win_xwindow_get(parent);

9
legacy/elementary/src/lib/elm_entry.c
View File

@ -2936,13 +2936,13 @@ _elm_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
ecore_event_handler_add
(ECORE_X_EVENT_SELECTION_CLEAR, _event_selection_clear, obj);
}
#endif
elm_drop_target_add
(obj, ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE,
NULL, NULL,
NULL, NULL,
NULL, NULL,
_drag_drop_cb, NULL);
#endif
entries = eina_list_prepend(entries, obj);
@ -3241,11 +3241,14 @@ _password_set(Eo *obj, void *_pd, va_list *list)
}
else
{
#ifdef HAVE_ELEMENTARY_X
elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP,
NULL, NULL,
NULL, NULL,
NULL, NULL,
_drag_drop_cb, NULL);
#endif
_entry_selection_callbacks_register(obj);
}
@ -3496,6 +3499,7 @@ _editable_set(Eo *obj, void *_pd, va_list *list)
sd->editable = editable;
eo_do(obj, elm_wdg_theme(NULL));
#ifdef HAVE_ELEMENTARY_X
if (editable)
elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP,
NULL, NULL,
@ -3503,6 +3507,7 @@ _editable_set(Eo *obj, void *_pd, va_list *list)
NULL, NULL,
_drag_drop_cb, NULL);
else
#endif
elm_drop_target_del(obj);
}
@ -4538,11 +4543,13 @@ _cnp_mode_set(Eo *obj, void *_pd, va_list *list)
format = ELM_SEL_FORMAT_TEXT;
else if (cnp_mode == ELM_CNP_MODE_MARKUP)
format |= ELM_SEL_FORMAT_IMAGE;
#ifdef HAVE_ELEMENTARY_X
elm_drop_target_add(obj, format,
NULL, NULL,
NULL, NULL,
NULL, NULL,
_drag_drop_cb, NULL);
#endif
}
EAPI Elm_Cnp_Mode

2
legacy/elementary/src/lib/elm_win.c
View File

@ -3636,12 +3636,14 @@ _main_menu_get(Eo *obj, void *_pd, va_list *list)
if (!_elm_config->disable_external_menu && sd->x.xwin) use_dbus = EINA_TRUE;
#endif
#ifdef HAVE_ELEMENTARY_X
if (use_dbus && _elm_dbus_menu_register(sd->main_menu))
{
_elm_dbus_menu_app_menu_register(sd->x.xwin, sd->main_menu,
_dbus_menu_set, obj);
}
else
#endif
_dbus_menu_set(EINA_FALSE, obj);
end: