← Back to branch summary

~oif-packaging/grail/raring

« back to all changes in this revision

Viewing changes to test/regular/frame_mock.h

  • Committer: Tarmac
  • Author(s): Daniel d'Andrada
  • Date: 2012-11-29 13:19:09 UTC
  • mfrom: (243.2.9 no_x11)
  • Revision ID: tarmac-20121129131909-th15fhhopcr663e5
Make grail build without X11

Enable grail to build without x11 libraries or dependencies.

Approved by Neil J. Patel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/regular/frame_mock.h
2
2
#define FRAME_MOCK_H
3
3
 
4
4
#include <oif/frame.h>
5
 
#include <oif/frame_x11.h>
6
5
#include <map>
7
6
#include <vector>
8
7
#include <memory>
9
8
 
 
9
extern "C" {
 
10
 
10
11
struct UFHandle_
11
12
{
12
13
  int fd;
49
50
  std::vector<struct UFAxis_> axes;
50
51
  float window_resolution_x;
51
52
  float window_resolution_y;
 
53
#ifdef FRAME_X11_BACKEND
52
54
  std::map<UFWindowId, std::map<UFTouchId, bool> > x11_touch_acceptance;
 
55
#endif
53
56
};
54
57
 
55
58
struct UFAxis_
58
61
  float resolution;
59
62
};
60
63
 
 
64
} // extern "C"
 
65
 
61
66
#endif