enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 11 Pull Requests 2 Projects Releases Wiki Activity

and now it actually buidls and runs without x support. 

SVN revision: 38078
This commit is contained in:
Carsten Haitzler 2008-12-10 06:43:21 +00:00
parent 2a41db988e
commit 2decf1c941
4 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/elementary/configure.in
View File

@ -51,6 +51,9 @@ PKG_CHECK_MODULES([ELEMENTARY_X], [ecore-x], [
have_elementary_x="no" have_elementary_x="no"
]) ])
AC_SUBST(ELEMENTARY_X_CFLAGS)
AC_SUBST(ELEMENTARY_X_LIBS)
have_elementary_fb="no" have_elementary_fb="no"
PKG_CHECK_MODULES([ELEMENTARY_FB], [ecore-fb], [ PKG_CHECK_MODULES([ELEMENTARY_FB], [ecore-fb], [
AC_DEFINE(HAVE_ELEMENTARY_FB, 1, [FB support for Elementary]) AC_DEFINE(HAVE_ELEMENTARY_FB, 1, [FB support for Elementary])

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

@ -368,9 +368,12 @@ _signal_selection_start(void *data, Evas_Object *obj, const char *emission, cons
char *txt = _mkup_to_text(elm_entry_selection_get(data)); char *txt = _mkup_to_text(elm_entry_selection_get(data));
if (txt) if (txt)
{ {
ecore_x_selection_primary_set #ifdef HAVE_ELEMENTARY_X
(elm_win_xwindow_get(elm_widget_top_get(data)), if (elm_win_xwindow_get(elm_widget_top_get(data)))
txt, strlen(txt)); ecore_x_selection_primary_set
(elm_win_xwindow_get(elm_widget_top_get(data)),
txt, strlen(txt));
#endif
free(txt); free(txt);
} }
} }
@ -387,9 +390,12 @@ _signal_selection_changed(void *data, Evas_Object *obj, const char *emission, co
char *txt = _mkup_to_text(elm_entry_selection_get(data)); char *txt = _mkup_to_text(elm_entry_selection_get(data));
if (txt) if (txt)
{ {
ecore_x_selection_primary_set #ifdef HAVE_ELEMENTARY_X
if (elm_win_xwindow_get(elm_widget_top_get(data)))
ecore_x_selection_primary_set
(elm_win_xwindow_get(elm_widget_top_get(data)), (elm_win_xwindow_get(elm_widget_top_get(data)),
txt, strlen(txt)); txt, strlen(txt));
#endif
free(txt); free(txt);
} }
} }
@ -406,14 +412,22 @@ _signal_selection_cleared(void *data, Evas_Object *obj, const char *emission, co
{ {
if (wd->cut_sel) if (wd->cut_sel)
{ {
ecore_x_selection_primary_set #ifdef HAVE_ELEMENTARY_X
if (elm_win_xwindow_get(elm_widget_top_get(data)))
ecore_x_selection_primary_set
(elm_win_xwindow_get(elm_widget_top_get(data)), (elm_win_xwindow_get(elm_widget_top_get(data)),
wd->cut_sel, strlen(wd->cut_sel)); wd->cut_sel, strlen(wd->cut_sel));
#endif
eina_stringshare_del(wd->cut_sel); eina_stringshare_del(wd->cut_sel);
wd->cut_sel = NULL; wd->cut_sel = NULL;
} }
else else
ecore_x_selection_primary_clear(); {
#ifdef HAVE_ELEMENTARY_X
if (elm_win_xwindow_get(elm_widget_top_get(data)))
ecore_x_selection_primary_clear();
#endif
}
} }
} }
@ -424,10 +438,15 @@ _signal_entry_paste_request(void *data, Evas_Object *obj, const char *emission,
evas_object_smart_callback_call(data, "selection,paste", NULL); evas_object_smart_callback_call(data, "selection,paste", NULL);
if (wd->sel_notify_handler) if (wd->sel_notify_handler)
{ {
ecore_x_selection_primary_request #ifdef HAVE_ELEMENTARY_X
(elm_win_xwindow_get(elm_widget_top_get(data)), if (elm_win_xwindow_get(elm_widget_top_get(data)))
ECORE_X_SELECTION_TARGET_UTF8_STRING); {
wd->selection_asked = 1; ecore_x_selection_primary_request
(elm_win_xwindow_get(elm_widget_top_get(data)),
ECORE_X_SELECTION_TARGET_UTF8_STRING);
wd->selection_asked = 1;
}
#endif
} }
} }

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

@ -10,8 +10,10 @@ static void _elm_rescale(void);
char *_elm_appname = NULL; char *_elm_appname = NULL;
Elm_Config *_elm_config = NULL; Elm_Config *_elm_config = NULL;
Ecore_Event_Handler *_elm_event_property_change = NULL; Ecore_Event_Handler *_elm_event_property_change = NULL;
#ifdef HAVE_ELEMENTARY_X
Ecore_X_Atom _elm_atom_enlightenment_scale = 0; Ecore_X_Atom _elm_atom_enlightenment_scale = 0;
#endif
static int static int
_elm_signal_exit(void *data, int ev_type, void *ev) _elm_signal_exit(void *data, int ev_type, void *ev)
{ {

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

@ -10,9 +10,7 @@ struct _Elm_Win
Evas_Object *parent; Evas_Object *parent;
Evas_Object *win_obj; Evas_Object *win_obj;
Eina_List *subobjs; Eina_List *subobjs;
#ifdef HAVE_ELEMENTARY_X
Ecore_X_Window xwin; Ecore_X_Window xwin;
#endif
Ecore_Job *deferred_resize_job; Ecore_Job *deferred_resize_job;
Ecore_Job *deferred_child_eval_job; Ecore_Job *deferred_child_eval_job;