enlightenment
/
enlightenment
5
6
Fork 6
Code Issues 15 Pull Requests 2 Projects Releases Wiki Activity

break out comp_x gl/sw canvas creation into external function

Browse Source
devs/stefan/wl-session-recovery
Mike Blumenkrantz 8 years ago
parent 36ea1ba372
commit 8c6ec83e43
3 changed files with 95 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 85
      src/bin/e_comp_x.c
  2. 91
      src/bin/e_comp_x_randr.c
  3. 2
      src/bin/e_comp_x_randr.h

85
src/bin/e_comp_x.c
Unescape View File

@ -4532,15 +4532,6 @@ _e_comp_x_cb_frame_extents_request(void *data EINA_UNUSED, int ev_type EINA_UNUS
return ECORE_CALLBACK_RENEW;
}
static void
_e_comp_x_pre_swap(void *data EINA_UNUSED, Evas *e EINA_UNUSED)
{
if (!e_comp_config_get()->grab) return;
if (!e_comp->grabbed) return;
ecore_x_ungrab();
e_comp->grabbed = 0;
}
static int
_e_comp_x_cinerama_screen_sort_cb(const void *data1, const void *data2)
{
@ -4907,18 +4898,6 @@ _e_comp_x_bindings_ungrab_cb(void)
}
}
static void
_e_comp_x_grab_cb(void)
{
if (!e_comp->grabbed)
{
ecore_x_grab();
ecore_x_sync();
}
else
ecore_x_ungrab();
}
static Eina_Bool
_e_comp_x_desklock_key_down(void *d EINA_UNUSED, int t EINA_UNUSED, Ecore_Event_Key *ev)
{
@ -5047,62 +5026,8 @@ _e_comp_x_setup(Ecore_X_Window root, int w, int h)
e_alert_composite_win(root, e_comp->win);
if (e_comp_gl_get() && (e_comp_config_get()->engine == E_COMP_ENGINE_GL))
{
int opt[20];
int opt_i = 0;
if (e_comp_config_get()->indirect)
{
opt[opt_i] = ECORE_EVAS_GL_X11_OPT_INDIRECT;
opt_i++;
opt[opt_i] = 1;
opt_i++;
}
if (e_comp_config_get()->vsync)
{
opt[opt_i] = ECORE_EVAS_GL_X11_OPT_VSYNC;
opt_i++;
opt[opt_i] = 1;
opt_i++;
}
#ifdef ECORE_EVAS_GL_X11_OPT_SWAP_MODE
if (e_comp_config_get()->swap_mode)
{
opt[opt_i] = ECORE_EVAS_GL_X11_OPT_SWAP_MODE;
opt_i++;
opt[opt_i] = e_comp_config_get()->swap_mode;
opt_i++;
}
#endif
if (opt_i > 0)
{
opt[opt_i] = ECORE_EVAS_GL_X11_OPT_NONE;
e_comp->ee = ecore_evas_gl_x11_options_new(NULL, e_comp->win, 0, 0, w, h, opt);
}
if (!e_comp->ee)
e_comp->ee = ecore_evas_gl_x11_new(NULL, e_comp->win, 0, 0, w, h);
if (e_comp->ee)
{
e_comp->gl = 1;
ecore_evas_gl_x11_pre_post_swap_callback_set(e_comp->ee, e_comp, _e_comp_x_pre_swap, NULL);
}
}
if (!e_comp->ee)
{
e_comp->ee = ecore_evas_software_x11_new(NULL, e_comp->win, 0, 0, w, h);
if (e_comp_config_get()->engine == E_COMP_ENGINE_GL)
ecore_job_add(_e_comp_x_add_fail_job, NULL);
e_comp_gl_set(0);
// tell elm and all elm apps to not allow acceleration since comp
// can't do it (or doesn't want to), so this may cause issues in
// gl drivers etc. - this addresses a vbox crash bug with vm
// opengl acceleration
elm_config_accel_preference_set("none");
elm_config_accel_preference_override_set(EINA_TRUE);
elm_config_all_flush();
elm_config_save();
}
if (!e_comp_x_randr_canvas_new(e_comp->win, w, h))
ecore_job_add(_e_comp_x_add_fail_job, NULL);
ecore_x_composite_redirect_subwindows(root, ECORE_X_COMPOSITE_UPDATE_MANUAL);
@ -5115,7 +5040,6 @@ _e_comp_x_setup(Ecore_X_Window root, int w, int h)
ecore_evas_callback_resize_set(e_comp->ee, _e_comp_x_ee_resize);
ecore_evas_data_set(e_comp->ee, "comp", e_comp);
e_comp->grab_cb = _e_comp_x_grab_cb;
e_comp->bindings_grab_cb = _e_comp_x_bindings_grab_cb;
e_comp->bindings_ungrab_cb = _e_comp_x_bindings_ungrab_cb;
@ -5235,11 +5159,6 @@ e_comp_x_init(void)
return EINA_FALSE;
}
if (!getenv("ECORE_X_NO_XLIB"))
{
if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11))
e_comp_gl_set(EINA_TRUE);
}
ecore_x_screensaver_event_listen_set(1);
clients_win_hash = eina_hash_int32_new(NULL);

91
src/bin/e_comp_x_randr.c
Unescape View File

@ -1,4 +1,5 @@
#include "e.h"
#include <Ecore_X.h>
static char *_output_screen_get(Ecore_X_Window root, Ecore_X_Randr_Output o);
static Ecore_X_Randr_Edid_Display_Interface_Type _output_conn_type_get(Ecore_X_Window root, Ecore_X_Randr_Output o);
@ -15,6 +16,27 @@ static Ecore_X_Randr_Mode _mode_screen_find(Ecore_X_Window root, E_Randr2_Screen
static Eina_List *handlers;
static void
_e_comp_x_randr_pre_swap(void *data EINA_UNUSED, Evas *e EINA_UNUSED)
{
if (!e_comp_config_get()->grab) return;
if (!e_comp->grabbed) return;
ecore_x_ungrab();
e_comp->grabbed = 0;
}
static void
_e_comp_x_randr_grab_cb(void)
{
if (!e_comp->grabbed)
{
ecore_x_grab();
ecore_x_sync();
}
else
ecore_x_ungrab();
}
static char *
_output_screen_get(Ecore_X_Window root, Ecore_X_Randr_Output o)
{
@ -795,3 +817,72 @@ e_comp_x_randr_create(void)
_info_relative_fixup(r);
return r;
}
EAPI Eina_Bool
e_comp_x_randr_canvas_new(Ecore_Window parent, int w, int h)
{
Eina_Bool ret = EINA_TRUE;
if (!getenv("ECORE_X_NO_XLIB"))
{
if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11))
e_comp_gl_set(EINA_TRUE);
}
if (e_comp_gl_get() && (e_comp_config_get()->engine == E_COMP_ENGINE_GL))
{
int opt[20];
int opt_i = 0;
if (e_comp_config_get()->indirect)
{
opt[opt_i] = ECORE_EVAS_GL_X11_OPT_INDIRECT;
opt_i++;
opt[opt_i] = 1;
opt_i++;
}
if (e_comp_config_get()->vsync)
{
opt[opt_i] = ECORE_EVAS_GL_X11_OPT_VSYNC;
opt_i++;
opt[opt_i] = 1;
opt_i++;
}
if (e_comp_config_get()->swap_mode)
{
opt[opt_i] = ECORE_EVAS_GL_X11_OPT_SWAP_MODE;
opt_i++;
opt[opt_i] = e_comp_config_get()->swap_mode;
opt_i++;
}
if (opt_i > 0)
{
opt[opt_i] = ECORE_EVAS_GL_X11_OPT_NONE;
e_comp->ee = ecore_evas_gl_x11_options_new(NULL, parent, 0, 0, w, h, opt);
}
if (!e_comp->ee)
e_comp->ee = ecore_evas_gl_x11_new(NULL, parent, 0, 0, w, h);
if (e_comp->ee)
{
e_comp->gl = 1;
ecore_evas_gl_x11_pre_post_swap_callback_set(e_comp->ee, e_comp, _e_comp_x_randr_pre_swap, NULL);
}
}
if (!e_comp->ee)
{
e_comp->ee = ecore_evas_software_x11_new(NULL, parent, 0, 0, w, h);
if (e_comp_config_get()->engine == E_COMP_ENGINE_GL)
ret = EINA_FALSE;
e_comp_gl_set(0);
// tell elm and all elm apps to not allow acceleration since comp
// can't do it (or doesn't want to), so this may cause issues in
// gl drivers etc. - this addresses a vbox crash bug with vm
// opengl acceleration
elm_config_accel_preference_set("none");
elm_config_accel_preference_override_set(EINA_TRUE);
elm_config_all_flush();
elm_config_save();
}
if (ret)
e_comp->grab_cb = _e_comp_x_randr_grab_cb;
return ret;
}

2
src/bin/e_comp_x_randr.h
Unescape View File

@ -6,4 +6,6 @@ EAPI void e_comp_x_randr_shutdown(void);
EAPI void e_comp_x_randr_config_apply(void);
EAPI Eina_Bool e_comp_x_randr_available(void);
EAPI E_Randr2 *e_comp_x_randr_create(void);
EAPI Eina_Bool e_comp_x_randr_canvas_new(Ecore_Window parent, int w, int h);
#endif

Write Preview
Loading…
Cancel
Save