summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-01-13 10:34:48 -0500
committerChris Michael <cp.michael@samsung.com>2015-01-13 10:35:52 -0500
commitbb8b00b95605e9ff1c8a65ff3c86ae368d980991 (patch)
treeab80f9c7e5d74b8659f99536f3e03830ed573d71 /src/modules
parent90ffc57f0c6d7c56047288dbdf78bdde4042e9bd (diff)
ecore-evas-drm: Init outputs before inputs so that input devices can
have a pointer to outputs Summary: In order to limit pointer motion, we need to assign an Output to each Input device. In order to accomplish that, we need to initialize Outputs first @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/ecore_evas/engines/drm/ecore_evas_drm.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index 059d96b4c0..7e458e1456 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -501,13 +501,6 @@ _ecore_evas_drm_init(const char *device)
501 goto sprite_err; 501 goto sprite_err;
502 } 502 }
503 503
504 /* try to create inputs */
505 if (!ecore_drm_inputs_create(dev))
506 {
507 ERR("Could not create inputs: %m");
508 goto input_err;
509 }
510
511 /* try to create outputs */ 504 /* try to create outputs */
512 if (!ecore_drm_outputs_create(dev)) 505 if (!ecore_drm_outputs_create(dev))
513 { 506 {
@@ -515,6 +508,13 @@ _ecore_evas_drm_init(const char *device)
515 goto output_err; 508 goto output_err;
516 } 509 }
517 510
511 /* try to create inputs */
512 if (!ecore_drm_inputs_create(dev))
513 {
514 ERR("Could not create inputs: %m");
515 goto input_err;
516 }
517
518 ecore_event_evas_init(); 518 ecore_event_evas_init();
519 519
520 return _ecore_evas_init_count; 520 return _ecore_evas_init_count;
@@ -539,8 +539,8 @@ _ecore_evas_drm_shutdown(void)
539{ 539{
540 if (--_ecore_evas_init_count != 0) return _ecore_evas_init_count; 540 if (--_ecore_evas_init_count != 0) return _ecore_evas_init_count;
541 541
542 /* NB: No need to free outputs here. Is done in device free */
543 ecore_drm_inputs_destroy(dev); 542 ecore_drm_inputs_destroy(dev);
543 /* NB: No need to free outputs here. Is done in device free */
544 ecore_drm_sprites_destroy(dev); 544 ecore_drm_sprites_destroy(dev);
545 ecore_drm_device_close(dev); 545 ecore_drm_device_close(dev);
546 ecore_drm_device_free(dev); 546 ecore_drm_device_free(dev);