← Back to branch summary

~cemil-azizoglu/mir/improve-raii-take2

« back to all changes in this revision

Viewing changes to include/common/mir_toolkit/events/event.h

  • Committer: Cemil Azizoglu
  • Date: 2015-02-26 23:37:35 UTC
  • mfrom: (2323.1.24 development-branch)
  • Revision ID: cemil.azizoglu@canonical.com-20150226233735-zm2j3eunf26b2hgb
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/common/mir_toolkit/events/event.h
42
42
    mir_event_type_close_surface,
43
43
    /* Type for new style input event will be returned from mir_event_get_type
44
44
       when old style event type was mir_event_type_key or mir_event_type_motion */
45
 
    mir_event_type_input
 
45
    mir_event_type_input,
 
46
    mir_event_type_keymap
46
47
} MirEventType;
47
48
 
48
49
typedef struct MirSurfaceEvent MirSurfaceEvent;
51
52
typedef struct MirOrientationEvent MirOrientationEvent;
52
53
typedef struct MirCloseSurfaceEvent MirCloseSurfaceEvent;
53
54
typedef struct MirInputEvent MirInputEvent;
 
55
typedef struct MirKeymapEvent MirKeymapEvent;
54
56
 
55
57
typedef union MirEvent MirEvent;
56
58
 
73
75
#include "mir_toolkit/events/surface_event.h"
74
76
#include "mir_toolkit/events/orientation_event.h"
75
77
#include "mir_toolkit/events/prompt_session_event.h"
 
78
#include "mir_toolkit/events/keymap_event.h"
76
79
 
77
80
#ifdef __cplusplus
78
81
/**
153
156
MirCloseSurfaceEvent const* mir_event_get_close_surface_event(MirEvent const* ev);
154
157
 
155
158
/*
 
159
 * Retrieve the MirKeymapEvent associated with a MirEvent of
 
160
 * type mir_event_type_keymap. The event signifies that the keymap
 
161
 * applied for the relevant surface has changed.
 
162
 *
 
163
 * \param [in] event The event
 
164
 * \return           The associated MirKeymapEvent
 
165
 */
 
166
MirKeymapEvent const* mir_event_get_keymap_event(MirEvent const* ev);
 
167
 
 
168
/*
156
169
 * 
157
170
 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
158
171
 * _________________________