aboutsummaryrefslogtreecommitdiff
path: root/src/block.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/block.h')
-rw-r--r--src/block.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/block.h b/src/block.h
index 6eeb0c0..d38a79d 100644
--- a/src/block.h
+++ b/src/block.h
@@ -8,6 +8,8 @@
#include "event.h"
#include "util.h"
#include "config.h"
+#include "action.h"
+#include "effect.h"
// Element or text alignment
//
@@ -26,10 +28,6 @@ typedef enum {
typedef struct block block_t;
-// Triggered when an event is directed towards the block
-//
-typedef void (*block_event_t)(block_t *block, event_t event);
-
// Regularly called depending on the inverval passed from the last update
//
typedef void (*block_update_t)(block_t *block);
@@ -49,10 +47,12 @@ struct block {
void *state;
struct timespec update_interval;
struct timespec update_last;
- block_update_t update_cb;
- block_event_t event_cb;
- block_finalize_t finalize_cb;
- struct effect *effect;
+ block_update_t update;
+ block_finalize_t finalize;
+ effect_t *effect;
+ action_t *right_click_action;
+ action_t *middle_click_action;
+ action_t *left_click_action;
color_t color;
color_t line_color;
unsigned int line_width;