mir: fix compile-time warnings
authorWilliam Hua <william.hua@canonical.com>
Mon, 9 Jan 2017 22:54:37 +0000 (17:54 -0500)
committerWilliam Hua <william.hua@canonical.com>
Sun, 22 Jan 2017 16:14:34 +0000 (11:14 -0500)
gdk/mir/gdkmir-debug.c
gdk/mir/gdkmireventsource.c
gdk/mir/gdkmirscreen.c

index 7dd54d5cb7eafd483a6a0e8aa29b1ea1b27e7faa..b0ff92985f1f7ea568020b18762240d23e567ca1 100644 (file)
@@ -127,6 +127,7 @@ _gdk_mir_print_touch_event (const MirInputEvent *event)
         }
       switch (mir_touch_event_tooltype (touch_event, i))
         {
+        default:
         case mir_touch_tooltype_unknown:
           g_printerr (" ? ");
           break;
@@ -199,6 +200,12 @@ _gdk_mir_print_motion_event (const MirInputEvent *event)
   g_printerr (" Event Time %lli\n", (long long int) mir_input_event_get_event_time (event));
 }
 
+static void
+_gdk_mir_print_input_event (const MirInputEvent *event)
+{
+  g_printerr ("INPUT\n");
+}
+
 static void
 _gdk_mir_print_surface_event (const MirSurfaceEvent *event)
 {
@@ -260,6 +267,9 @@ _gdk_mir_print_event (const MirEvent *event)
           case mir_input_event_type_pointer:
             _gdk_mir_print_motion_event (mir_event_get_input_event (event));
             break;
+          default:
+            _gdk_mir_print_input_event (mir_event_get_input_event (event));
+            break;
         }
       break;
     case mir_event_type_key:
index a2a1a128b76640504d5764cf0cbc1465f1d78717..d3c85b96148321dd09e438f2ee32a98dfd0e6438 100644 (file)
@@ -571,6 +571,8 @@ gdk_mir_event_source_queue_event (GdkDisplay     *display,
         case mir_input_event_type_pointer:
           handle_motion_event (window, input_event);
           break;
+        default:
+          break;
         }
 
       break;
index b369b037e12fa25a0ddceeeb571cdc9a10514a00..979f2ba5e3eee1458017f4b9298a577206648d8b 100644 (file)
@@ -354,6 +354,10 @@ gdk_mir_screen_get_monitor_plug_name (GdkScreen *screen,
             return g_strdup_printf ("eDP-%u", output->output_id);
           case mir_display_output_type_virtual:
             return g_strdup_printf ("Virtual-%u", output->output_id);
+          case mir_display_output_type_dsi:
+            return g_strdup_printf ("DSI-%u", output->output_id);
+          case mir_display_output_type_dpi:
+            return g_strdup_printf ("DPI-%u", output->output_id);
         }
     }