diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-08-17 21:04:05 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-08-17 21:06:28 -0400 |
| commit | 3138c5ddf04441fb7572db8c1a80b3789c4cc563 (patch) | |
| tree | d838f8a08ea4cdb333db3c5954ba15eda53579f8 /examples | |
| parent | 854a9381ca2040c3b550323ff9f90c864a431b27 (diff) | |
Clean up wlr_output_layout
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/output-layout.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/examples/output-layout.c b/examples/output-layout.c index 320d11f8..c16af634 100644 --- a/examples/output-layout.c +++ b/examples/output-layout.c @@ -127,9 +127,7 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts } static inline int max(int a, int b) { - if (a < b) - return b; - return a; + return a < b ? b : a; } static void configure_layout(struct sample_state *sample) { @@ -202,8 +200,8 @@ static void update_velocities(struct compositor_state *state, sample->y_vel += y_diff; } -static void handle_keyboard_key(struct keyboard_state *kbstate, - xkb_keysym_t sym, enum wlr_key_state key_state) { +static void handle_keyboard_key(struct keyboard_state *kbstate, uint32_t keycode, + xkb_keysym_t sym, enum wlr_key_state key_state) { // NOTE: It may be better to simply refer to our key state during each frame // and make this change in pixels/sec^2 // Also, key repeat |