← Back to branch summary

~ubuntu-branches/ubuntu/vivid/clutter-1.0/vivid-proposed

« back to all changes in this revision

Viewing changes to clutter/wayland/clutter-event-wayland.c

  • Committer: Package Import Robot
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2014-03-26 11:51:28 UTC
  • mfrom: (1.5.1) (4.1.30 experimental)
  • Revision ID: package-import@ubuntu.com-20140326115128-timmbsde8734o6wz
Tags: 1.18.0-1
* New upstream release.
* debian/control.in:
  + Bump gtk-doc-tools build dependency.
  + Also break libcogl15.
  + Standards-Version is 3.9.5, no changes needed.
* debian/libclutter-1.0-0.symbols:
  + Drop a few symbols that were accidentally exported in the DSO because
    they had a clutter_ prefix but were not in the public headers.
  + Add one new symbol.
  + Drop unnecessary debian revisions from some symbols.
* debian/control.in,
  debian/rules,
  debian/libclutter-1.0-0.symbols:
  + Temporarily disable evdev input support. It was only enabled in 1.17.6-1
    in experimental and there is nothing using it yet, and I would like to
    wait a bit before uploading libinput to unstable as the ABI isn't stable
    yet.
* d/p/0001-wayland-Add-missing-CLUTTER_AVAILABLE-annotations.patch:
  + Add missing annotations so that a few symbols are exported in the DSO.

* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clutter/wayland/clutter-event-wayland.c
35
35
#include "clutter-event.h"
36
36
#include "clutter-main.h"
37
37
#include "clutter-private.h"
 
38
#include "clutter-stage-private.h"
38
39
 
39
40
#include "clutter-event-wayland.h"
40
41
 
41
42
typedef struct _ClutterEventSourceWayland
42
43
{
43
44
  GSource source;
44
 
  GPollFD pfd;
45
45
  struct wl_display *display;
46
46
} ClutterEventSourceWayland;
47
47
 
70
70
static gboolean
71
71
clutter_event_source_wayland_check (GSource *base)
72
72
{
73
 
  ClutterEventSourceWayland *source = (ClutterEventSourceWayland *) base;
74
73
  gboolean retval;
75
74
 
76
75
  _clutter_threads_acquire_lock ();
77
76
 
78
 
  retval = clutter_events_pending () || source->pfd.revents;
 
77
  retval = clutter_events_pending ();
79
78
 
80
79
  _clutter_threads_release_lock ();
81
80
 
87
86
                                       GSourceFunc callback,
88
87
                                       gpointer data)
89
88
{
90
 
  ClutterEventSourceWayland *source = (ClutterEventSourceWayland *) base;
91
89
  ClutterEvent *event;
92
90
 
93
91
  _clutter_threads_acquire_lock ();
94
92
 
95
 
  if (source->pfd.revents)
96
 
    {
97
 
      wl_display_dispatch (source->display);
98
 
      source->pfd.revents = 0;
99
 
    }
100
 
 
101
93
  event = clutter_event_get ();
102
94
 
103
95
  if (event)
104
96
    {
105
97
      /* forward the event into clutter for emission etc. */
106
 
      clutter_do_event (event);
107
 
      clutter_event_free (event);
 
98
      _clutter_stage_queue_event (event->any.stage, event, FALSE);
108
99
    }
109
100
 
110
101
  _clutter_threads_release_lock ();
129
120
    g_source_new (&clutter_event_source_wayland_funcs,
130
121
                  sizeof (ClutterEventSourceWayland));
131
122
  source->display = display;
132
 
  source->pfd.fd =
133
 
    wl_display_get_fd (display);
134
 
  source->pfd.events = G_IO_IN | G_IO_ERR;
135
 
  g_source_add_poll (&source->source, &source->pfd);
136
123
 
137
124
  return &source->source;
138
125
}