← Back to branch summary

~oif-packaging/grail/raring

« back to all changes in this revision

Viewing changes to test/x11/fixture.cpp

  • Committer: Chase Douglas
  • Date: 2012-06-21 20:30:14 UTC
  • mto: This revision was merged to the branch mainline in revision 234.
  • Revision ID: chase.douglas@ubuntu.com-20120621203014-g2uhy6mg779aufop
Rename utouch-grail to grail

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/x11/fixture.cpp
23
23
 
24
24
#include <X11/extensions/XInput2.h>
25
25
 
26
 
#include "utouch/frame.h"
27
 
#include "utouch/frame_x11.h"
 
26
#include "oif/frame.h"
 
27
#include "oif/frame_x11.h"
28
28
 
29
 
void utouch::grail::x11::testing::Test::SetUp() {
 
29
void oif::grail::x11::testing::Test::SetUp() {
30
30
  ASSERT_NO_FATAL_FAILURE(xorg::testing::Test::SetUp());
31
31
 
32
32
  int xi_major = 2;
108
108
  ASSERT_NE(grail_handle_, nullptr);
109
109
}
110
110
 
111
 
void utouch::grail::x11::testing::Test::PumpEvents(uint64_t timeout) {
 
111
void oif::grail::x11::testing::Test::PumpEvents(uint64_t timeout) {
112
112
  fd_set set;
113
113
  FD_ZERO(&set);
114
114
 
188
188
  }
189
189
}
190
190
 
191
 
bool utouch::grail::x11::testing::Test::FilterXIEvent(
 
191
bool oif::grail::x11::testing::Test::FilterXIEvent(
192
192
    const XGenericEventCookie* xcookie) {
193
193
  return false;
194
194
}
195
195
 
196
 
void utouch::grail::x11::testing::Test::UpdateTime(
 
196
void oif::grail::x11::testing::Test::UpdateTime(
197
197
    const XSyncAlarmNotifyEvent& event) {
198
198
  /* Process any outstanding frames first */
199
199
  ProcessFrameEvents();
206
206
  grail_update_time(grail_handle(), server_time);
207
207
}
208
208
 
209
 
void utouch::grail::x11::testing::Test::SetX11Timeout() {
 
209
void oif::grail::x11::testing::Test::SetX11Timeout() {
210
210
  uint64_t timeout = grail_next_timeout(grail_handle());
211
211
  if (timeout > 0) {
212
212
    XSyncAlarmAttributes attrs;
221
221
  }
222
222
}
223
223
 
224
 
void utouch::grail::x11::testing::Test::TearDown() {
 
224
void oif::grail::x11::testing::Test::TearDown() {
225
225
  XSyncDestroyAlarm(Display(), alarm_);
226
226
  grail_delete_v3(grail_handle_);
227
227
  frame_x11_delete(frame_handle_);