]> Pileus Git - ~andy/gtk/blobdiff - gdk/broadway/gdkdisplay-broadway.c
stylecontext: Do invalidation on first resize container
[~andy/gtk] / gdk / broadway / gdkdisplay-broadway.c
index d7f6d5d82d0ebf68398913f4bd4bb980b7970f9a..8a3bf6500a8a54b85f37010dd9fe7c0a5257af0b 100644 (file)
@@ -17,9 +17,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -32,7 +30,7 @@
 #include "gdkscreen-broadway.h"
 #include "gdkinternals.h"
 #include "gdkdeviceprivate.h"
-#include "gdkdevicemanager.h"
+#include "gdkdevicemanager-broadway.h"
 
 #include <glib.h>
 #include <glib/gprintf.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
 
-static void   gdk_display_broadway_dispose            (GObject            *object);
-static void   gdk_display_broadway_finalize           (GObject            *object);
+static void   gdk_broadway_display_dispose            (GObject            *object);
+static void   gdk_broadway_display_finalize           (GObject            *object);
 
-G_DEFINE_TYPE (GdkDisplayBroadway, _gdk_display_broadway, GDK_TYPE_DISPLAY)
+#if 0
+#define DEBUG_WEBSOCKETS 1
+#endif
 
+G_DEFINE_TYPE (GdkBroadwayDisplay, gdk_broadway_display, GDK_TYPE_DISPLAY)
 
 static void
-_gdk_display_broadway_class_init (GdkDisplayBroadwayClass * class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->dispose = gdk_display_broadway_dispose;
-  object_class->finalize = gdk_display_broadway_finalize;
-}
-
-static void
-_gdk_display_broadway_init (GdkDisplayBroadway *display)
+gdk_broadway_display_init (GdkBroadwayDisplay *display)
 {
+  _gdk_broadway_display_manager_add_display (gdk_display_manager_get (),
+                                            GDK_DISPLAY_OBJECT (display));
   display->id_ht = g_hash_table_new (NULL, NULL);
 }
 
 static void
-_gdk_event_init (GdkDisplay *display)
+gdk_event_init (GdkDisplay *display)
 {
-  GdkDisplayBroadway *display_broadway;
+  GdkBroadwayDisplay *broadway_display;
 
-  display_broadway = GDK_DISPLAY_BROADWAY (display);
-  display_broadway->event_source = gdk_event_source_new (display);
+  broadway_display = GDK_BROADWAY_DISPLAY (display);
+  broadway_display->event_source = _gdk_broadway_event_source_new (display);
 }
 
 static void
-_gdk_input_init (GdkDisplay *display)
+gdk_broadway_display_init_input (GdkDisplay *display)
 {
-  GdkDisplayBroadway *display_broadway;
+  GdkBroadwayDisplay *broadway_display;
   GdkDeviceManager *device_manager;
   GdkDevice *device;
   GList *list, *l;
 
-  display_broadway = GDK_DISPLAY_BROADWAY (display);
+  broadway_display = GDK_BROADWAY_DISPLAY (display);
   device_manager = gdk_display_get_device_manager (display);
 
   /* For backwards compatibility, just add
@@ -94,7 +92,7 @@ _gdk_input_init (GdkDisplay *display)
       if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
         continue;
 
-      display_broadway->input_devices = g_list_prepend (display_broadway->input_devices,
+      broadway_display->input_devices = g_list_prepend (broadway_display->input_devices,
                                                    g_object_ref (l->data));
     }
 
@@ -117,425 +115,62 @@ _gdk_input_init (GdkDisplay *display)
     }
 
   /* Add the core pointer to the devices list */
-  display_broadway->input_devices = g_list_prepend (display_broadway->input_devices,
+  broadway_display->input_devices = g_list_prepend (broadway_display->input_devices,
                                                g_object_ref (display->core_pointer));
 
   g_list_free (list);
 }
 
-struct HttpRequest {
-  GdkDisplay *display;
-  GSocketConnection *connection;
-  GDataInputStream *data;
-  GString *request;
-};
-
-static void
-http_request_free (HttpRequest *request)
-{
-  g_object_unref (request->connection);
-  g_object_unref (request->data);
-  g_string_free (request->request, TRUE);
-  g_free (request);
-}
-
-#include <unistd.h>
-#include <fcntl.h>
-static void
-set_fd_blocking (int fd)
-{
-  glong arg;
-
-  if ((arg = fcntl (fd, F_GETFL, NULL)) < 0)
-    arg = 0;
-
-  arg = arg & ~O_NONBLOCK;
-
-  fcntl (fd, F_SETFL, arg);
-}
-
-static char *
-parse_line (char *line, char *key)
-{
-  char *p;
-
-  if (!g_str_has_prefix (line, key))
-    return NULL;
-  p = line + strlen (key);
-  if (*p != ':')
-    return NULL;
-  p++;
-  /* Skip optional initial space */
-  if (*p == ' ')
-    p++;
-  return p;
-}
-
-static void
-got_input (GInputStream *stream,
-          GAsyncResult *result,
-          HttpRequest *request)
-{
-  GError *error;
-  char *message;
-  gsize len;
-
-  error = NULL;
-  message = g_data_input_stream_read_upto_finish (G_DATA_INPUT_STREAM (stream), result, &len, &error);
-  if (message == NULL)
-    {
-      GDK_DISPLAY_BROADWAY (request->display)->input = NULL;
-      http_request_free (request);
-      return;
-    }
-
-  g_assert (message[0] == 0);
-  _gdk_events_got_input (request->display, message + 1);
-
-  /* Skip past ending 0xff */
-  g_data_input_stream_read_byte (request->data, NULL, NULL);
-  g_data_input_stream_read_upto_async (request->data, "\xff", 1, 0, NULL,
-                                      (GAsyncReadyCallback)got_input, request);
-}
-
-static void
-send_error (HttpRequest *request,
-           int error_code,
-           const char *reason)
-{
-  char *res;
-
-  res = g_strdup_printf ("HTTP/1.0 %d %s\r\n\r\n"
-                        "<html><head><title>%d %s</title></head>"
-                        "<body>%s</body></html>",
-                        error_code, reason,
-                        error_code, reason,
-                        reason);
-  /* TODO: This should really be async */
-  g_output_stream_write_all (g_io_stream_get_output_stream (G_IO_STREAM (request->connection)),
-                            res, strlen (res), NULL, NULL, NULL);
-  g_free (res);
-  http_request_free (request);
-}
-
-static void
-start_input (HttpRequest *request)
-{
-  char **lines;
-  char *p;
-  int num_key1, num_key2;
-  guint64 key1, key2;
-  int num_space;
-  int i;
-  guint8 challenge[16];
-  char *res;
-  gsize len;
-  GChecksum *checksum;
-  char *origin, *host;
-  GdkDisplayBroadway *display_broadway;
-
-  display_broadway = GDK_DISPLAY_BROADWAY (request->display);
-
-  if (display_broadway->input != NULL)
-    {
-      send_error (request, 409, "Input already handled");
-      return;
-    }
-
-  lines = g_strsplit (request->request->str, "\n", 0);
-
-  num_key1 = 0;
-  num_key2 = 0;
-  key1 = 0;
-  key2 = 0;
-  origin = NULL;
-  host = NULL;
-  for (i = 0; lines[i] != NULL; i++)
-    {
-      if ((p = parse_line (lines[i], "Sec-WebSocket-Key1")))
-       {
-         num_space = 0;
-         while (*p != 0)
-           {
-             if (g_ascii_isdigit (*p))
-               key1 = key1 * 10 + g_ascii_digit_value (*p);
-             else if (*p == ' ')
-               num_space++;
-
-             p++;
-           }
-         key1 /= num_space;
-         num_key1++;
-       }
-      else if ((p = parse_line (lines[i], "Sec-WebSocket-Key2")))
-       {
-         num_space = 0;
-         while (*p != 0)
-           {
-             if (g_ascii_isdigit (*p))
-               key2 = key2 * 10 + g_ascii_digit_value (*p);
-             else if (*p == ' ')
-               num_space++;
-
-             p++;
-           }
-         key2 /= num_space;
-         num_key2++;
-       }
-      else if ((p = parse_line (lines[i], "Origin")))
-       {
-         origin = p;
-       }
-      else if ((p = parse_line (lines[i], "Host")))
-       {
-         host = p;
-       }
-    }
-
-  if (num_key1 != 1 || num_key2 != 1 || origin == NULL || host == NULL)
-    {
-      g_strfreev (lines);
-      send_error (request, 400, "Bad websocket request");
-      return;
-    }
-
-  challenge[0] = (key1 >> 24) & 0xff;
-  challenge[1] = (key1 >> 16) & 0xff;
-  challenge[2] = (key1 >>  8) & 0xff;
-  challenge[3] = (key1 >>  0) & 0xff;
-  challenge[4] = (key2 >> 24) & 0xff;
-  challenge[5] = (key2 >> 16) & 0xff;
-  challenge[6] = (key2 >>  8) & 0xff;
-  challenge[7] = (key2 >>  0) & 0xff;
-
-  if (!g_input_stream_read_all (G_INPUT_STREAM (request->data), challenge+8, 8, NULL, NULL, NULL))
-    {
-      g_strfreev (lines);
-      send_error (request, 400, "Bad websocket request");
-      return;
-    }
-
-  checksum = g_checksum_new (G_CHECKSUM_MD5);
-  g_checksum_update (checksum, challenge, 16);
-  len = 16;
-  g_checksum_get_digest (checksum, challenge, &len);
-  g_checksum_free (checksum);
-
-  res = g_strdup_printf ("HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
-                        "Upgrade: WebSocket\r\n"
-                        "Connection: Upgrade\r\n"
-                        "Sec-WebSocket-Origin: %s\r\n"
-                        "Sec-WebSocket-Location: ws://%s/input\r\n"
-                        "Sec-WebSocket-Protocol: broadway\r\n"
-                        "\r\n",
-                        origin, host);
-
-  /* TODO: This should really be async */
-  g_output_stream_write_all (g_io_stream_get_output_stream (G_IO_STREAM (request->connection)),
-                            res, strlen (res), NULL, NULL, NULL);
-  g_free (res);
-  g_output_stream_write_all (g_io_stream_get_output_stream (G_IO_STREAM (request->connection)),
-                            challenge, 16, NULL, NULL, NULL);
-
-  display_broadway->input = request;
-
-  g_data_input_stream_read_upto_async (request->data, "\xff", 1, 0, NULL,
-                                      (GAsyncReadyCallback)got_input, request);
-
-  g_strfreev (lines);
-}
-
-static void
-start_output (HttpRequest *request)
-{
-  GSocket *socket;
-  GdkDisplayBroadway *display_broadway;
-  int fd;
-
-  socket = g_socket_connection_get_socket (request->connection);
-
-  display_broadway = GDK_DISPLAY_BROADWAY (request->display);
-  fd = g_socket_get_fd (socket);
-  set_fd_blocking (fd);
-  /* We dup this because otherwise it'll be closed with the request SocketConnection */
-  display_broadway->output = broadway_output_new (dup(fd));
-  _gdk_broadway_resync_windows ();
-  http_request_free (request);
-}
-
-static void
-send_data (HttpRequest *request,
-            const char *mimetype,
-            const char *data, gsize len)
-{
-  char *res;
-
-  res = g_strdup_printf ("HTTP/1.0 200 OK\r\n"
-                        "Content-Type: %s\r\n"
-                        "Content-Length: %"G_GSIZE_FORMAT"\r\n"
-                        "\r\n",
-                        mimetype, len);
-  /* TODO: This should really be async */
-  g_output_stream_write_all (g_io_stream_get_output_stream (G_IO_STREAM (request->connection)),
-                            res, strlen (res), NULL, NULL, NULL);
-  g_free (res);
-  g_output_stream_write_all (g_io_stream_get_output_stream (G_IO_STREAM (request->connection)),
-                            data, len, NULL, NULL, NULL);
-  http_request_free (request);
-}
-
-#include "clienthtml.h"
-#include "broadwayjs.h"
-
-static void
-got_request (HttpRequest *request)
-{
-  char *start, *escaped, *tmp, *version;
-
-  if (!g_str_has_prefix (request->request->str, "GET "))
-    {
-      send_error (request, 501, "Only GET implemented");
-      return;
-    }
-
-  start = request->request->str + 4; /* Skip "GET " */
-
-  while (*start == ' ')
-    start++;
-
-  for (tmp = start; *tmp != 0 && *tmp != ' ' && *tmp != '\n'; tmp++)
-    ;
-  escaped = g_strndup (start, tmp - start);
-  version = NULL;
-  if (*tmp == ' ')
-    {
-      start = tmp;
-      while (*start == ' ')
-       start++;
-      for (tmp = start; *tmp != 0 && *tmp != ' ' && *tmp != '\n'; tmp++)
-       ;
-      version = g_strndup (start, tmp - start);
-    }
-
-  if (strcmp (escaped, "/client.html") == 0 || strcmp (escaped, "/") == 0)
-    send_data (request, "text/html", client_html, G_N_ELEMENTS(client_html) - 1);
-  else if (strcmp (escaped, "/broadway.js") == 0)
-    send_data (request, "text/javascript", broadway_js, G_N_ELEMENTS(broadway_js) - 1);
-  else if (strcmp (escaped, "/output") == 0)
-    start_output (request);
-  else if (strcmp (escaped, "/input") == 0)
-    start_input (request);
-  else
-    send_error (request, 404, "File not found");
-}
-
-static void
-got_http_request_line (GInputStream *stream,
-                      GAsyncResult *result,
-                      HttpRequest *request)
-{
-  char *line;
-
-  line = g_data_input_stream_read_line_finish (G_DATA_INPUT_STREAM (stream), result, NULL, NULL);
-  if (line == NULL)
-    {
-      http_request_free (request);
-      g_printerr ("Error reading request lines\n");
-      return;
-    }
-  if (strlen (line) == 0)
-    got_request (request);
-  else
-    {
-      /* Protect against overflow in request length */
-      if (request->request->len > 1024 * 5)
-       {
-         send_error (request, 400, "Request to long");
-       }
-      else
-       {
-         g_string_append_printf (request->request, "%s\n", line);
-         g_data_input_stream_read_line_async (request->data, 0, NULL,
-                                              (GAsyncReadyCallback)got_http_request_line, request);
-       }
-    }
-  g_free (line);
-}
-
-static gboolean
-handle_incoming_connection (GSocketService    *service,
-                           GSocketConnection *connection,
-                           GObject           *source_object)
-{
-  HttpRequest *request;
-  GInputStream *in;
-
-  request = g_new0 (HttpRequest, 1);
-  request->connection = g_object_ref (connection);
-  request->display = (GdkDisplay *) source_object;
-  request->request = g_string_new ("");
-
-  in = g_io_stream_get_input_stream (G_IO_STREAM (connection));
-
-  request->data = g_data_input_stream_new (in);
-  g_filter_input_stream_set_close_base_stream (G_FILTER_INPUT_STREAM (request->data), FALSE);
-  /* Be tolerant of input */
-  g_data_input_stream_set_newline_type (request->data, G_DATA_STREAM_NEWLINE_TYPE_ANY);
-
-  g_data_input_stream_read_line_async (request->data, 0, NULL,
-                                      (GAsyncReadyCallback)got_http_request_line, request);
-  return TRUE;
-}
-
 GdkDisplay *
-gdk_display_open (const gchar *display_name)
+_gdk_broadway_display_open (const gchar *display_name)
 {
   GdkDisplay *display;
-  GdkDisplayBroadway *display_broadway;
-  const char *sm_client_id;
-  GError *error;
-
-  display = g_object_new (GDK_TYPE_DISPLAY_BROADWAY, NULL);
-  display_broadway = GDK_DISPLAY_BROADWAY (display);
+  GdkBroadwayDisplay *broadway_display;
+  int port;
 
-  display_broadway->output = NULL;
+  display = g_object_new (GDK_TYPE_BROADWAY_DISPLAY, NULL);
+  broadway_display = GDK_BROADWAY_DISPLAY (display);
 
   /* initialize the display's screens */
-  display_broadway->screens = g_new (GdkScreen *, 1);
-  display_broadway->screens[0] = _gdk_broadway_screen_new (display, 0);
+  broadway_display->screens = g_new (GdkScreen *, 1);
+  broadway_display->screens[0] = _gdk_broadway_screen_new (display, 0);
 
   /* We need to initialize events after we have the screen
    * structures in places
    */
-  _gdk_screen_broadway_events_init (display_broadway->screens[0]);
+  _gdk_broadway_screen_events_init (broadway_display->screens[0]);
 
   /*set the default screen */
-  display_broadway->default_screen = display_broadway->screens[0];
+  broadway_display->default_screen = broadway_display->screens[0];
 
-  display->device_manager = _gdk_device_manager_new (display);
+  display->device_manager = _gdk_broadway_device_manager_new (display);
 
-  _gdk_event_init (display);
+  gdk_event_init (display);
 
-  sm_client_id = _gdk_get_sm_client_id ();
-  if (sm_client_id)
-    _gdk_windowing_display_set_sm_client_id (display, sm_client_id);
+  gdk_broadway_display_init_input (display);
+  _gdk_broadway_display_init_dnd (display);
 
-  _gdk_input_init (display);
-  _gdk_dnd_init (display);
+  _gdk_broadway_screen_setup (broadway_display->screens[0]);
 
-  _gdk_broadway_screen_setup (display_broadway->screens[0]);
+  if (display_name == NULL)
+    display_name = g_getenv ("BROADWAY_DISPLAY");
 
-  display_broadway->service = g_socket_service_new ();
-  if (!g_socket_listener_add_inet_port (G_SOCKET_LISTENER (display_broadway->service),
-                                       8080,
-                                       G_OBJECT (display),
-                                       &error))
+  port = 0;
+  if (display_name != NULL)
     {
-      g_printerr ("Unable to listen to port %d: %s\n", 8080, error->message);
-      g_error_free (error);
+      if (*display_name == ':')
+       display_name++;
+      port = strtol(display_name, NULL, 10);
+    }
+  if (port == 0)
+    port = 1;
+
+  broadway_display->server = _gdk_broadway_server_new (port, NULL);
+  if (broadway_display->server == NULL)
+    {
+      g_printerr ("Unable to init server\n");
       return NULL;
     }
-  g_signal_connect (display_broadway->service, "incoming", G_CALLBACK (handle_incoming_connection), NULL);
 
   g_signal_emit_by_name (display, "opened");
   g_signal_emit_by_name (gdk_display_manager_get (), "display-opened", display);
@@ -543,69 +178,74 @@ gdk_display_open (const gchar *display_name)
   return display;
 }
 
-
-G_CONST_RETURN gchar *
-gdk_display_get_name (GdkDisplay *display)
+static const gchar *
+gdk_broadway_display_get_name (GdkDisplay *display)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
 
   return (gchar *) "Broadway";
 }
 
-gint
-gdk_display_get_n_screens (GdkDisplay *display)
+static gint
+gdk_broadway_display_get_n_screens (GdkDisplay *display)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), 0);
 
   return 1;
 }
 
-GdkScreen *
-gdk_display_get_screen (GdkDisplay *display,
-                       gint        screen_num)
+static GdkScreen *
+gdk_broadway_display_get_screen (GdkDisplay *display,
+                                gint        screen_num)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
   g_return_val_if_fail (screen_num == 0, NULL);
 
-  return GDK_DISPLAY_BROADWAY (display)->screens[screen_num];
+  return GDK_BROADWAY_DISPLAY (display)->screens[screen_num];
 }
 
-GdkScreen *
-gdk_display_get_default_screen (GdkDisplay *display)
+static GdkScreen *
+gdk_broadway_display_get_default_screen (GdkDisplay *display)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
 
-  return GDK_DISPLAY_BROADWAY (display)->default_screen;
+  return GDK_BROADWAY_DISPLAY (display)->default_screen;
 }
 
-void
-gdk_device_ungrab (GdkDevice  *device,
-                   guint32     time_)
+static void
+gdk_broadway_display_beep (GdkDisplay *display)
 {
+  g_return_if_fail (GDK_IS_DISPLAY (display));
 }
 
-void
-gdk_display_beep (GdkDisplay *display)
+static void
+gdk_broadway_display_sync (GdkDisplay *display)
 {
-  g_return_if_fail (GDK_IS_DISPLAY (display));
+  GdkBroadwayDisplay *broadway_display = GDK_BROADWAY_DISPLAY (display);
+
+  g_return_if_fail (GDK_IS_BROADWAY_DISPLAY (display));
+
+  _gdk_broadway_server_sync (broadway_display->server);
 }
 
-void
-gdk_display_sync (GdkDisplay *display)
+static void
+gdk_broadway_display_flush (GdkDisplay *display)
 {
-  g_return_if_fail (GDK_IS_DISPLAY (display));
+  GdkBroadwayDisplay *broadway_display = GDK_BROADWAY_DISPLAY (display);
 
+  g_return_if_fail (GDK_IS_BROADWAY_DISPLAY (display));
+
+  _gdk_broadway_server_flush (broadway_display->server);
 }
 
-void
-gdk_display_flush (GdkDisplay *display)
+static gboolean
+gdk_broadway_display_has_pending (GdkDisplay *display)
 {
-  g_return_if_fail (GDK_IS_DISPLAY (display));
-
+  return FALSE;
 }
 
-GdkWindow *
-gdk_display_get_default_group (GdkDisplay *display)
+static GdkWindow *
+gdk_broadway_display_get_default_group (GdkDisplay *display)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
 
@@ -613,156 +253,186 @@ gdk_display_get_default_group (GdkDisplay *display)
 }
 
 static void
-gdk_display_broadway_dispose (GObject *object)
+gdk_broadway_display_dispose (GObject *object)
 {
-  GdkDisplayBroadway *display_broadway = GDK_DISPLAY_BROADWAY (object);
+  GdkBroadwayDisplay *broadway_display = GDK_BROADWAY_DISPLAY (object);
+
+  _gdk_broadway_display_manager_remove_display (gdk_display_manager_get (),
+                                               GDK_DISPLAY_OBJECT (object));
 
-  g_list_foreach (display_broadway->input_devices, (GFunc) g_object_run_dispose, NULL);
+  g_list_foreach (broadway_display->input_devices, (GFunc) g_object_run_dispose, NULL);
 
-  _gdk_screen_close (display_broadway->screens[0]);
+  _gdk_screen_close (broadway_display->screens[0]);
 
-  if (display_broadway->event_source)
+  if (broadway_display->event_source)
     {
-      g_source_destroy (display_broadway->event_source);
-      g_source_unref (display_broadway->event_source);
-      display_broadway->event_source = NULL;
+      g_source_destroy (broadway_display->event_source);
+      g_source_unref (broadway_display->event_source);
+      broadway_display->event_source = NULL;
     }
 
-  G_OBJECT_CLASS (_gdk_display_broadway_parent_class)->dispose (object);
+  G_OBJECT_CLASS (gdk_broadway_display_parent_class)->dispose (object);
 }
 
 static void
-gdk_display_broadway_finalize (GObject *object)
+gdk_broadway_display_finalize (GObject *object)
 {
-  GdkDisplayBroadway *display_broadway = GDK_DISPLAY_BROADWAY (object);
+  GdkBroadwayDisplay *broadway_display = GDK_BROADWAY_DISPLAY (object);
 
   /* Keymap */
-  if (display_broadway->keymap)
-    g_object_unref (display_broadway->keymap);
+  if (broadway_display->keymap)
+    g_object_unref (broadway_display->keymap);
 
-  _gdk_broadway_cursor_display_finalize (GDK_DISPLAY_OBJECT(display_broadway));
-
-  /* Atom Hashtable */
-  g_hash_table_destroy (display_broadway->atom_from_virtual);
-  g_hash_table_destroy (display_broadway->atom_to_virtual);
+  _gdk_broadway_cursor_display_finalize (GDK_DISPLAY_OBJECT(broadway_display));
 
   /* input GdkDevice list */
-  g_list_foreach (display_broadway->input_devices, (GFunc) g_object_unref, NULL);
-  g_list_free (display_broadway->input_devices);
+  g_list_free_full (broadway_display->input_devices, g_object_unref);
   /* Free all GdkScreens */
-  g_object_unref (display_broadway->screens[0]);
-  g_free (display_broadway->screens);
-
-  G_OBJECT_CLASS (_gdk_display_broadway_parent_class)->finalize (object);
-}
+  g_object_unref (broadway_display->screens[0]);
+  g_free (broadway_display->screens);
 
-void
-_gdk_windowing_set_default_display (GdkDisplay *display)
-{
+  G_OBJECT_CLASS (gdk_broadway_display_parent_class)->finalize (object);
 }
 
 void
-gdk_notify_startup_complete (void)
+_gdk_broadway_display_make_default (GdkDisplay *display)
 {
 }
 
-void
-gdk_notify_startup_complete_with_id (const gchar* startup_id)
+static void
+gdk_broadway_display_notify_startup_complete (GdkDisplay  *display,
+                                             const gchar *startup_id)
 {
 }
 
-gboolean
-gdk_display_supports_selection_notification (GdkDisplay *display)
+static gboolean
+gdk_broadway_display_supports_selection_notification (GdkDisplay *display)
 {
   return FALSE;
 }
 
-gboolean
-gdk_display_request_selection_notification (GdkDisplay *display,
-                                           GdkAtom     selection)
+static gboolean
+gdk_broadway_display_request_selection_notification (GdkDisplay *display,
+                                                    GdkAtom     selection)
 
 {
     return FALSE;
 }
 
-gboolean
-gdk_display_supports_clipboard_persistence (GdkDisplay *display)
+static gboolean
+gdk_broadway_display_supports_clipboard_persistence (GdkDisplay *display)
 {
   return FALSE;
 }
 
-void
-gdk_display_store_clipboard (GdkDisplay    *display,
-                            GdkWindow     *clipboard_window,
-                            guint32        time_,
-                            const GdkAtom *targets,
-                            gint           n_targets)
+static void
+gdk_broadway_display_store_clipboard (GdkDisplay    *display,
+                                     GdkWindow     *clipboard_window,
+                                     guint32        time_,
+                                     const GdkAtom *targets,
+                                     gint           n_targets)
 {
 }
 
-gboolean
-gdk_display_supports_shapes (GdkDisplay *display)
+static gboolean
+gdk_broadway_display_supports_shapes (GdkDisplay *display)
 {
   return FALSE;
 }
 
-gboolean
-gdk_display_supports_input_shapes (GdkDisplay *display)
+static gboolean
+gdk_broadway_display_supports_input_shapes (GdkDisplay *display)
 {
   return FALSE;
 }
 
-gboolean
-gdk_display_supports_composite (GdkDisplay *display)
+static gboolean
+gdk_broadway_display_supports_composite (GdkDisplay *display)
 {
   return FALSE;
 }
 
-GList *
-gdk_display_list_devices (GdkDisplay *display)
+static GList *
+gdk_broadway_display_list_devices (GdkDisplay *display)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
 
-  return GDK_DISPLAY_BROADWAY (display)->input_devices;
+  return GDK_BROADWAY_DISPLAY (display)->input_devices;
 }
 
-gboolean
-gdk_event_send_client_message_for_display (GdkDisplay     *display,
-                                          GdkEvent       *event,
-                                          GdkNativeWindow winid)
+static gulong
+gdk_broadway_display_get_next_serial (GdkDisplay *display)
 {
-  return FALSE;
-}
+  GdkBroadwayDisplay *broadway_display;
+  broadway_display = GDK_BROADWAY_DISPLAY (display);
 
-void
-gdk_display_add_client_message_filter (GdkDisplay   *display,
-                                      GdkAtom       message_type,
-                                      GdkFilterFunc func,
-                                      gpointer      data)
-{
+  return _gdk_broadway_server_get_next_serial (broadway_display->server);
 }
 
-void
-gdk_add_client_message_filter (GdkAtom       message_type,
-                              GdkFilterFunc func,
-                              gpointer      data)
+static void
+gdk_broadway_display_event_data_copy (GdkDisplay    *display,
+                                     const GdkEvent *src,
+                                     GdkEvent       *dst)
 {
 }
 
-void
-gdk_flush (void)
+static void
+gdk_broadway_display_event_data_free (GdkDisplay    *display,
+                                     GdkEvent *event)
 {
-  GSList *tmp_list = _gdk_displays;
-
-  while (tmp_list)
-    {
-      gdk_display_flush (GDK_DISPLAY_OBJECT (tmp_list->data));
-      tmp_list = tmp_list->next;
-    }
 }
 
-gulong
-_gdk_windowing_window_get_next_serial (GdkDisplay *display)
+static void
+gdk_broadway_display_class_init (GdkBroadwayDisplayClass * class)
 {
-  return 0;
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GdkDisplayClass *display_class = GDK_DISPLAY_CLASS (class);
+
+  object_class->dispose = gdk_broadway_display_dispose;
+  object_class->finalize = gdk_broadway_display_finalize;
+
+  display_class->window_type = GDK_TYPE_BROADWAY_WINDOW;
+
+  display_class->get_name = gdk_broadway_display_get_name;
+  display_class->get_n_screens = gdk_broadway_display_get_n_screens;
+  display_class->get_screen = gdk_broadway_display_get_screen;
+  display_class->get_default_screen = gdk_broadway_display_get_default_screen;
+  display_class->beep = gdk_broadway_display_beep;
+  display_class->sync = gdk_broadway_display_sync;
+  display_class->flush = gdk_broadway_display_flush;
+  display_class->has_pending = gdk_broadway_display_has_pending;
+  display_class->queue_events = _gdk_broadway_display_queue_events;
+  display_class->get_default_group = gdk_broadway_display_get_default_group;
+  display_class->supports_selection_notification = gdk_broadway_display_supports_selection_notification;
+  display_class->request_selection_notification = gdk_broadway_display_request_selection_notification;
+  display_class->supports_clipboard_persistence = gdk_broadway_display_supports_clipboard_persistence;
+  display_class->store_clipboard = gdk_broadway_display_store_clipboard;
+  display_class->supports_shapes = gdk_broadway_display_supports_shapes;
+  display_class->supports_input_shapes = gdk_broadway_display_supports_input_shapes;
+  display_class->supports_composite = gdk_broadway_display_supports_composite;
+  display_class->list_devices = gdk_broadway_display_list_devices;
+  display_class->get_cursor_for_type = _gdk_broadway_display_get_cursor_for_type;
+  display_class->get_cursor_for_name = _gdk_broadway_display_get_cursor_for_name;
+  display_class->get_cursor_for_pixbuf = _gdk_broadway_display_get_cursor_for_pixbuf;
+  display_class->get_default_cursor_size = _gdk_broadway_display_get_default_cursor_size;
+  display_class->get_maximal_cursor_size = _gdk_broadway_display_get_maximal_cursor_size;
+  display_class->supports_cursor_alpha = _gdk_broadway_display_supports_cursor_alpha;
+  display_class->supports_cursor_color = _gdk_broadway_display_supports_cursor_color;
+
+  display_class->before_process_all_updates = _gdk_broadway_display_before_process_all_updates;
+  display_class->after_process_all_updates = _gdk_broadway_display_after_process_all_updates;
+  display_class->get_next_serial = gdk_broadway_display_get_next_serial;
+  display_class->notify_startup_complete = gdk_broadway_display_notify_startup_complete;
+  display_class->event_data_copy = gdk_broadway_display_event_data_copy;
+  display_class->event_data_free = gdk_broadway_display_event_data_free;
+  display_class->create_window_impl = _gdk_broadway_display_create_window_impl;
+  display_class->get_keymap = _gdk_broadway_display_get_keymap;
+  display_class->get_selection_owner = _gdk_broadway_display_get_selection_owner;
+  display_class->set_selection_owner = _gdk_broadway_display_set_selection_owner;
+  display_class->send_selection_notify = _gdk_broadway_display_send_selection_notify;
+  display_class->get_selection_property = _gdk_broadway_display_get_selection_property;
+  display_class->convert_selection = _gdk_broadway_display_convert_selection;
+  display_class->text_property_to_utf8_list = _gdk_broadway_display_text_property_to_utf8_list;
+  display_class->utf8_to_string_target = _gdk_broadway_display_utf8_to_string_target;
 }
+