@bugfix: Fix pointer to work in drm and also fix some formatting

Signed-off-by: Chris Michael <cp.michael@samsung.com>

diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index e101dcb..1e2fe14 100644 (file)
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -266,55 +266,56 @@ _e_pointer_type_set(E_Pointer *p,
         return;
      }
 fallback:
-#ifndef HAVE_WAYLAND_ONLY
    if (p->canvas) return;
-   {
-      Ecore_X_Cursor cursor = 0;
-
-      E_FREE_FUNC(p->pointer_image, evas_object_del);
-      if (p->evas) _e_pointer_canvas_del(p);
-      if (!strcmp(type, "move"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_FLEUR);
-#if 0
-      else if (!strcmp(type, "resize"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_SIZING);
-#endif
-      else if (!strcmp(type, "resize_tl"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_LEFT_CORNER);
-      else if (!strcmp(type, "resize_t"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_SIDE);
-      else if (!strcmp(type, "resize_tr"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_RIGHT_CORNER);
-      else if (!strcmp(type, "resize_r"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_RIGHT_SIDE);
-      else if (!strcmp(type, "resize_br"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_RIGHT_CORNER);
-      else if (!strcmp(type, "resize_b"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_SIDE);
-      else if (!strcmp(type, "resize_bl"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_LEFT_CORNER);
-      else if (!strcmp(type, "resize_l"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_SIDE);
-      else if (!strcmp(type, "entry"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_XTERM);
-      else if (!strcmp(type, "default"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_PTR);
-      else if (!strcmp(type, "plus"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_PLUS);
-      else if (!strcmp(type, "hand"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_HAND1);
-      else if (!strcmp(type, "rotate"))
-        cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_EXCHANGE);
-      else
-        {
-           printf("Unknown pointer type: %s\n", type);
-           cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_ARROW);
-        }
-      if (!cursor) printf("X Cursor for %s is missing\n", type);
-      ecore_x_window_cursor_set(p->win, cursor);
-      if (cursor) ecore_x_cursor_free(cursor);
-   }
+     {
+        E_FREE_FUNC(p->pointer_image, evas_object_del);
+        if (p->evas) _e_pointer_canvas_del(p);
+
+#ifndef HAVE_WAYLAND_ONLY
+        Ecore_X_Cursor cursor = 0;
+
+        if (!strcmp(type, "move"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_FLEUR);
+# if 0
+        else if (!strcmp(type, "resize"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_SIZING);
+# endif
+        else if (!strcmp(type, "resize_tl"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_LEFT_CORNER);
+        else if (!strcmp(type, "resize_t"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_SIDE);
+        else if (!strcmp(type, "resize_tr"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_RIGHT_CORNER);
+        else if (!strcmp(type, "resize_r"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_RIGHT_SIDE);
+        else if (!strcmp(type, "resize_br"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_RIGHT_CORNER);
+        else if (!strcmp(type, "resize_b"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_SIDE);
+        else if (!strcmp(type, "resize_bl"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_LEFT_CORNER);
+        else if (!strcmp(type, "resize_l"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_SIDE);
+        else if (!strcmp(type, "entry"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_XTERM);
+        else if (!strcmp(type, "default"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_PTR);
+        else if (!strcmp(type, "plus"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_PLUS);
+        else if (!strcmp(type, "hand"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_HAND1);
+        else if (!strcmp(type, "rotate"))
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_EXCHANGE);
+        else
+          {
+             printf("Unknown pointer type: %s\n", type);
+             cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_ARROW);
+          }
+        if (!cursor) printf("X Cursor for %s is missing\n", type);
+        ecore_x_window_cursor_set(p->win, cursor);
+        if (cursor) ecore_x_cursor_free(cursor);
 #endif
+     }
    return;
 }
 
@@ -706,8 +707,7 @@ EAPI void
 e_pointer_hide(E_Pointer *p)
 {
    if (!p) return;
-#ifdef HAVE_WAYLAND_ONLY
-#else
+#ifndef HAVE_WAYLAND_ONLY
    if (p->win) ecore_x_window_cursor_set(p->win, 0);
 #endif
    if (p->canvas)
@@ -730,13 +730,13 @@ e_pointer_type_push(E_Pointer *p,
    if (!p->canvas)
      {
         evas_object_hide(p->pointer_image);
-#ifndef HAVE_WAYLAND_ONLY
         if (p->blocks)
           {
+#ifndef HAVE_WAYLAND_ONLY
              ecore_x_cursor_size_set(e_config->cursor_size * 3 / 4);
+#endif
              _e_pointer_canvas_resize(p, e_config->cursor_size, e_config->cursor_size);
           }
-#endif
      }
    _e_pointer_type_set(p, type);
 
@@ -782,15 +782,13 @@ e_pointer_type_pop(E_Pointer *p,
         if (p->pointer_image)
           {
              evas_object_show(p->pointer_image);
-#ifndef HAVE_WAYLAND_ONLY
              if (!p->canvas)
                {
                   int w, h;
 
                   e_pixmap_size_get(p->pixmap, &w, &h);
                   _e_pointer_canvas_resize(p, w, h);
-          }
-#endif
+               }
           }
      }
 
@@ -804,7 +802,6 @@ e_pointer_type_pop(E_Pointer *p,
 EAPI void
 e_pointer_idler_before(void)
 {
-#ifndef HAVE_WAYLAND_ONLY
    Eina_List *l;
    E_Pointer *p;
 
@@ -828,6 +825,7 @@ e_pointer_idler_before(void)
                        evas_object_image_data_set(p->pointer_image, p->pixels);
                     }
                }
+#ifndef HAVE_WAYLAND_ONLY
              else
                {
                   Ecore_X_Cursor cur;
@@ -837,11 +835,11 @@ e_pointer_idler_before(void)
                   ecore_x_window_cursor_set(p->win, cur);
                   ecore_x_cursor_free(cur);
                }
+#endif
              evas_render_updates_free(updates);
           }
         p->hot.update = 0;
      }
-#endif
 }
 
 /**