diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-05-01 09:46:24 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-05-01 09:46:24 +0000 |
| commit | 69c3e744983e37662fa7b4f61482fb1d142e257c (patch) | |
| tree | c32f324f64bd0a581a14853b6bf638fe9d2125c0 | |
| parent | term: don't enable ptmx FDM callback until Wayland window has been configured (diff) | |
util.h: new header file defining commonly used macros
| -rw-r--r-- | commands.c | 4 | ||||
| -rw-r--r-- | config.c | 4 | ||||
| -rw-r--r-- | csi.c | 3 | ||||
| -rw-r--r-- | grid.c | 3 | ||||
| -rw-r--r-- | input.c | 3 | ||||
| -rw-r--r-- | quirks.c | 3 | ||||
| -rw-r--r-- | render.c | 5 | ||||
| -rw-r--r-- | search.c | 3 | ||||
| -rw-r--r-- | selection.c | 4 | ||||
| -rw-r--r-- | sixel.c | 6 | ||||
| -rw-r--r-- | terminal.c | 5 | ||||
| -rw-r--r-- | util.h | 5 | ||||
| -rw-r--r-- | vt.c | 4 | ||||
| -rw-r--r-- | wayland.c | 5 |
14 files changed, 18 insertions, 39 deletions
@@ -6,9 +6,7 @@ #include "terminal.h" #include "render.h" #include "grid.h" - -#define max(x, y) ((x) > (y) ? (x) : (y)) -#define min(x, y) ((x) < (y) ? (x) : (y)) +#include "util.h" void cmd_scrollback_up(struct terminal *term, int rows) @@ -19,11 +19,9 @@ #define LOG_ENABLE_DBG 0 #include "log.h" #include "input.h" +#include "util.h" #include "wayland.h" -#define ALEN(v) (sizeof(v) / sizeof(v[0])) -#define min(x, y) ((x) < (y) ? (x) : (y)) - static const uint32_t default_foreground = 0xdcdccc; static const uint32_t default_background = 0x111111; @@ -16,8 +16,7 @@ #include "vt.h" #include "selection.h" #include "sixel.h" - -#define min(x, y) ((x) < (y) ? (x) : (y)) +#include "util.h" #define UNHANDLED() LOG_DBG("unhandled: %s", csi_as_string(term, final, -1)) #define UNHANDLED_SGR(idx) LOG_DBG("unhandled: %s", csi_as_string(term, 'm', idx)) @@ -7,8 +7,7 @@ #define LOG_ENABLE_DBG 0 #include "log.h" #include "sixel.h" - -#define max(x, y) ((x) > (y) ? (x) : (y)) +#include "util.h" void grid_swap_row(struct grid *grid, int row_a, int row_b, bool initialize) @@ -29,10 +29,9 @@ #include "search.h" #include "selection.h" #include "terminal.h" +#include "util.h" #include "vt.h" -#define ALEN(v) (sizeof(v) / sizeof(v[0])) - static void execute_binding(struct terminal *term, enum bind_action_normal action, uint32_t serial) @@ -7,8 +7,7 @@ #define LOG_MODULE "quirks" #define LOG_ENABLE_DBG 0 #include "log.h" - -#define ALEN(v) (sizeof(v) / sizeof(v[0])) +#include "util.h" static bool is_weston(void) @@ -21,14 +21,11 @@ #include "quirks.h" #include "selection.h" #include "shm.h" +#include "util.h" #define TIME_FRAME_RENDERING 0 #define TIME_SCROLL_DAMAGE 0 -#define ALEN(v) (sizeof(v) / sizeof((v)[0])) -#define min(x, y) ((x) < (y) ? (x) : (y)) -#define max(x, y) ((x) > (y) ? (x) : (y)) - struct renderer { struct fdm *fdm; struct wayland *wayl; @@ -16,8 +16,7 @@ #include "render.h" #include "selection.h" #include "shm.h" - -#define max(x, y) ((x) > (y) ? (x) : (y)) +#include "util.h" static bool search_ensure_size(struct terminal *term, size_t wanted_size) diff --git a/selection.c b/selection.c index 534a0888..4ed24dca 100644 --- a/selection.c +++ b/selection.c @@ -17,11 +17,9 @@ #include "grid.h" #include "misc.h" #include "render.h" +#include "util.h" #include "vt.h" -#define min(x, y) ((x) < (y) ? (x) : (y)) -#define max(x, y) ((x) > (y) ? (x) : (y)) - bool selection_enabled(const struct terminal *term) { @@ -7,11 +7,7 @@ #include "log.h" #include "render.h" #include "sixel-hls.h" - -#define ALEN(v) (sizeof(v) / sizeof(v[0])) -#define max(x, y) ((x) > (y) ? (x) : (y)) -#define min(x, y) ((x) < (y) ? (x) : (y)) - +#include "util.h" static size_t count; @@ -27,12 +27,9 @@ #include "selection.h" #include "sixel.h" #include "slave.h" +#include "util.h" #include "vt.h" -#define ALEN(v) (sizeof(v) / sizeof(v[0])) -#define min(x, y) ((x) < (y) ? (x) : (y)) -#define max(x, y) ((x) > (y) ? (x) : (y)) - #define PTMX_TIMING 0 static const char *const XCURSOR_LEFT_PTR = "left_ptr"; @@ -0,0 +1,5 @@ +#pragma once + +#define ALEN(v) (sizeof(v) / sizeof((v)[0])) +#define min(x, y) ((x) < (y) ? (x) : (y)) +#define max(x, y) ((x) > (y) ? (x) : (y)) @@ -16,9 +16,7 @@ #include "dcs.h" #include "grid.h" #include "osc.h" - -#define min(x, y) ((x) < (y) ? (x) : (y)) -#define max(x, y) ((x) > (y) ? (x) : (y)) +#include "util.h" #define UNHANDLED() LOG_DBG("unhandled: %s", esc_as_string(term, final)) @@ -28,10 +28,7 @@ #include "input.h" #include "render.h" #include "selection.h" - -#define ALEN(v) (sizeof(v) / sizeof(v[0])) -#define min(x, y) ((x) < (y) ? (x) : (y)) -#define max(x, y) ((x) > (y) ? (x) : (y)) +#include "util.h" static bool wayl_reload_cursor_theme( struct wayland *wayl, struct terminal *term); |
