Reduce SCREEN_ prefix spam in screen

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 53 insertions, 53 deletions

diff --git a/src/screen/screen.c b/src/screen/screen.c
index ae9b001..29868d3 100644
--- a/src/screen/screen.c
+++ b/src/screen/screen.c
@@ -8,23 +8,23 @@
 #include "view.h"
 #include "screen.h"
 
-#define SCREEN_INVALID_TS ((u64)-1)
+#define INVALID_TS ((u64)-1)
 
-#define SCREEN_MOD1(scr) ((scr)->window->held_modifiers & (STELA_MOD_LCONTROL | STELA_MOD_RCONTROL))
-#define SCREEN_MOD2(scr) ((scr)->window->held_modifiers & (STELA_MOD_LSHIFT | STELA_MOD_RSHIFT))
-#define SCREEN_MOUSE_MOD(scr) ((scr)->flags & CAMU_SCREEN_MOUSE_MOD)
+#define MOD1(scr) ((scr)->window->held_modifiers & (STELA_MOD_LCONTROL | STELA_MOD_RCONTROL))
+#define MOD2(scr) ((scr)->window->held_modifiers & (STELA_MOD_LSHIFT | STELA_MOD_RSHIFT))
+#define MOUSE_MOD(scr) ((scr)->flags & CAMU_SCREEN_MOUSE_MOD)
 
-#define SCREEN_IS_DRAGGING(scr) ((scr)->flags & CAMU_SCREEN_DRAGGING)
-#define SCREEN_IS_ZOOMING(scr) ((scr)->flags & CAMU_SCREEN_ZOOMING)
-#define SCREEN_IS_FROZEN(scr) ((scr)->flags & CAMU_SCREEN_FROZEN)
-#define SCREEN_ZOOM_MODE(scr, mode) ((scr)->flags & mode)
+#define IS_DRAGGING(scr) ((scr)->flags & CAMU_SCREEN_DRAGGING)
+#define IS_ZOOMING(scr) ((scr)->flags & CAMU_SCREEN_ZOOMING)
+#define IS_FROZEN(scr) ((scr)->flags & CAMU_SCREEN_FROZEN)
+#define ZOOM_MODE(scr, mode) ((scr)->flags & mode)
 
-#define SCREEN_DEFAULT_CURSOR(scr) ((scr->fullscreen || scr->vr_emulation) ? STELA_CURSOR_HIDDEN : STELA_CURSOR_NORMAL)
+#define DEFAULT_CURSOR(scr) ((scr->fullscreen || scr->vr_emulation) ? STELA_CURSOR_HIDDEN : STELA_CURSOR_NORMAL)
 
-#define SCREEN_LAST_CLICK_WITHIN(ns) \
-    (((scr)->last_click_ts != SCREEN_INVALID_TS) && (nn_get_timestamp() - (scr)->last_click_ts <= ns))
+#define LAST_CLICK_WITHIN(ns) \
+    (((scr)->last_click_ts != INVALID_TS) && (nn_get_timestamp() - (scr)->last_click_ts <= ns))
 
-#define SCREEN_OSD_BAR_HEIGHT 15
+#define OSD_BAR_HEIGHT 15
 
 static void should_close_callback(void *userdata)
 {
@@ -98,7 +98,7 @@ static bool pointer_callback(void *userdata, u8 type, f64 x, f64 y)
         if (scr->vr_emulation && have_pointer_move) {
             break;
         }
-        if (SCREEN_IS_DRAGGING(scr)) {
+        if (IS_DRAGGING(scr)) {
 #ifdef CAMU_SCREEN_DRAG_SEEK
             u64 now = nn_get_timestamp();
             if (view && now - scr->last_seek_ts > 100000) {
@@ -106,7 +106,7 @@ static bool pointer_callback(void *userdata, u8 type, f64 x, f64 y)
                 scr->last_seek_ts = now;
             }
 #else
-            if (view && !SCREEN_MOD1(scr) && SCREEN_ZOOM_MODE(scr, CAMU_SCREEN_ZOOM_PAN_SIMPLE)) {
+            if (view && !MOD1(scr) && ZOOM_MODE(scr, CAMU_SCREEN_ZOOM_PAN_SIMPLE)) {
                 f64 dx = x - scr->last_pointer_x;
                 f64 dy = y - scr->last_pointer_y;
                 if (camu_view_pan_simple(view, scr->width, scr->height, dx, dy)) {
@@ -114,14 +114,14 @@ static bool pointer_callback(void *userdata, u8 type, f64 x, f64 y)
                     queue_refresh = true;
                 }
                 if (fabs(dx) + fabs(dy) > 6.0) {
-                    scr->last_click_ts = SCREEN_INVALID_TS;
+                    scr->last_click_ts = INVALID_TS;
                 }
             }
 #endif
         }
-        if (SCREEN_MOD1(scr) && scr->osd.duration > 0) {
+        if (MOD1(scr) && scr->osd.duration > 0) {
             f64 dx = x - scr->last_pointer_x;
-            if (fabs(dx) >= 2.0 || y >= scr->height - SCREEN_OSD_BAR_HEIGHT) {
+            if (fabs(dx) >= 2.0 || y >= scr->height - OSD_BAR_HEIGHT) {
                 scr->osd.bar_mode = CAMU_OSD_BAR_SEEK;
             }
         }
@@ -156,17 +156,17 @@ static bool touch_callback(void *userdata, s32 index, u8 phase, f64 x, f64 y)
             scr->last_touch_x[1] = x;
             scr->last_touch_y[1] = y;
         }
-        if (!SCREEN_IS_DRAGGING(scr)) {
+        if (!IS_DRAGGING(scr)) {
             scr->flags |= CAMU_SCREEN_DRAGGING;
             scr->last_click_ts = nn_get_timestamp();
-        } else if (!SCREEN_IS_ZOOMING(scr)) {
+        } else if (!IS_ZOOMING(scr)) {
             scr->flags |= CAMU_SCREEN_ZOOMING;
             f64 lx = scr->last_touch_x[0], lx2 = scr->last_touch_x[1];
             f64 ly = scr->last_touch_y[0], ly2 = scr->last_touch_y[1];
             scr->last_distance = distance(lx, lx2, ly, ly2);
             scr->midpoint_x = (lx + lx2) / 2.0;
             scr->midpoint_y = (ly + ly2) / 2.0;
-        } else if (!SCREEN_IS_FROZEN(scr)) {
+        } else if (!IS_FROZEN(scr)) {
             scr->flags |= CAMU_SCREEN_FROZEN;
             struct camu_view *view = get_view_from_mouse_pos(scr);
             if (view) {
@@ -178,9 +178,9 @@ static bool touch_callback(void *userdata, s32 index, u8 phase, f64 x, f64 y)
     }
     case STELA_TOUCH_MOVED: {
         // @TODO: Track current index 1 and 2. On release search for next non-0 index in mask.
-        if (SCREEN_IS_FROZEN(scr)) {
+        if (IS_FROZEN(scr)) {
             return false;
-        } else if (SCREEN_IS_ZOOMING(scr)) {
+        } else if (IS_ZOOMING(scr)) {
             if (index == 0) {
                 scr->last_touch_x[0] = x;
                 scr->last_touch_y[0] = y;
@@ -204,7 +204,7 @@ static bool touch_callback(void *userdata, s32 index, u8 phase, f64 x, f64 y)
             refresh |= scroll_callback(scr, (dist - scr->last_distance) / 120.0);
             scr->last_distance = dist;
             return refresh;
-        } else if (SCREEN_IS_DRAGGING(scr)) {
+        } else if (IS_DRAGGING(scr)) {
             if (index == 0) {
                 scr->last_pointer_x = scr->last_touch_x[0];
                 scr->last_pointer_y = scr->last_touch_y[0];
@@ -225,14 +225,14 @@ static bool touch_callback(void *userdata, s32 index, u8 phase, f64 x, f64 y)
         break;
     }
     case STELA_TOUCH_ENDED: {
-        if (SCREEN_IS_FROZEN(scr)) {
+        if (IS_FROZEN(scr)) {
             scr->flags &= ~CAMU_SCREEN_FROZEN;
             seek_to_percent_at_pointer(scr, x);
-        } else if (SCREEN_IS_ZOOMING(scr)) {
+        } else if (IS_ZOOMING(scr)) {
             scr->flags &= ~CAMU_SCREEN_ZOOMING;
-        } else if (SCREEN_IS_DRAGGING(scr)) {
+        } else if (IS_DRAGGING(scr)) {
             scr->flags &= ~CAMU_SCREEN_DRAGGING;
-            if (SCREEN_LAST_CLICK_WITHIN(200000)) {
+            if (LAST_CLICK_WITHIN(200000)) {
                 f64 third = scr->width / 3.0;
                 if (x >= third && x <= third * 2.0) {
                     if (scr->vr_emulation) {
@@ -273,10 +273,10 @@ static bool mouse_button_callback(void *userdata, u8 state, u8 button)
             break;
         case STELA_BUTTON_RELEASED:
             scr->flags &= ~CAMU_SCREEN_DRAGGING;
-            bool want_crosshair = SCREEN_MOUSE_MOD(scr) && scr->fullscreen;
-            scr->window->set_cursor(scr->window, want_crosshair ? STELA_CURSOR_CROSSHAIR : SCREEN_DEFAULT_CURSOR(scr));
-            if (SCREEN_LAST_CLICK_WITHIN(200000)) {
-                if (SCREEN_MOD1(scr)) {
+            bool want_crosshair = MOUSE_MOD(scr) && scr->fullscreen;
+            scr->window->set_cursor(scr->window, want_crosshair ? STELA_CURSOR_CROSSHAIR : DEFAULT_CURSOR(scr));
+            if (LAST_CLICK_WITHIN(200000)) {
+                if (MOD1(scr)) {
                     seek_to_percent_at_pointer(scr, scr->last_pointer_x);
                 } else {
                     s32 n = (scr->last_pointer_x >= scr->width / 2.0) ? 1 : -1;
@@ -290,14 +290,14 @@ static bool mouse_button_callback(void *userdata, u8 state, u8 button)
         switch (state) {
         case STELA_BUTTON_PRESSED:
             scr->flags |= CAMU_SCREEN_MOUSE_MOD;
-            if (scr->fullscreen && !SCREEN_IS_DRAGGING(scr)) {
+            if (scr->fullscreen && !IS_DRAGGING(scr)) {
                 scr->window->set_cursor(scr->window, STELA_CURSOR_CROSSHAIR);
             }
             break;
         case STELA_BUTTON_RELEASED:
             scr->flags &= ~CAMU_SCREEN_MOUSE_MOD;
-            if (!SCREEN_IS_DRAGGING(scr)) {
-                scr->window->set_cursor(scr->window, SCREEN_DEFAULT_CURSOR(scr));
+            if (!IS_DRAGGING(scr)) {
+                scr->window->set_cursor(scr->window, DEFAULT_CURSOR(scr));
             }
             break;
         }
@@ -320,7 +320,7 @@ static bool mouse_button_callback(void *userdata, u8 state, u8 button)
 bool scroll_callback(void *userdata, f64 y)
 {
     struct camu_screen *scr = (struct camu_screen *)userdata;
-    if (SCREEN_MOD1(scr)) {
+    if (MOD1(scr)) {
         f32 change = (f32)stl_scale_scroll(y, 40.0);
         scr->callback(scr->userdata, CAMU_SCREEN_OFFSET_VOLUME, &change);
         scr->osd.bar_mode = CAMU_OSD_BAR_VOLUME;
@@ -329,12 +329,12 @@ bool scroll_callback(void *userdata, f64 y)
     } else {
         struct camu_view *view = get_view_from_mouse_pos(scr);
         if (view) {
-            if (SCREEN_ZOOM_MODE(scr, CAMU_SCREEN_ZOOM_PAN_SIMPLE)) {
+            if (ZOOM_MODE(scr, CAMU_SCREEN_ZOOM_PAN_SIMPLE)) {
                 if (camu_view_zoom_simple(view, scr->width, scr->height, scr->last_pointer_x, scr->last_pointer_y, stl_scale_scroll(y, 15.0))) {
                     view->mode = CAMU_VIEW_DETACHED;
                     return true;
                 }
-            } else if (SCREEN_ZOOM_MODE(scr, CAMU_SCREEN_ZOOM_FOV)) {
+            } else if (ZOOM_MODE(scr, CAMU_SCREEN_ZOOM_FOV)) {
                 camu_view_zoom_fov(view, stl_scale_scroll(y, 20.0));
             }
         }
@@ -356,8 +356,8 @@ static bool key_callback(void *userdata, u8 state, u16 button)
             scr->osd.show_binds = !scr->osd.show_binds;
             break;
         case STELA_KEY_RIGHT:
-            if (SCREEN_MOD1(scr)) {
-                if (SCREEN_MOD2(scr)) {
+            if (MOD1(scr)) {
+                if (MOD2(scr)) {
                     f64 one_hundred = 100.0;
                     scr->callback(scr->userdata, CAMU_SCREEN_PERCENT_SEEK, &one_hundred);
                 } else {
@@ -373,8 +373,8 @@ static bool key_callback(void *userdata, u8 state, u16 button)
             break;
         }
         case STELA_KEY_LEFT:
-            if (SCREEN_MOD1(scr)) {
-                if (SCREEN_MOD2(scr)) {
+            if (MOD1(scr)) {
+                if (MOD2(scr)) {
                     f64 zero = 0.0;
                     scr->callback(scr->userdata, CAMU_SCREEN_PERCENT_SEEK, &zero);
                 } else {
@@ -398,7 +398,7 @@ static bool key_callback(void *userdata, u8 state, u16 button)
                 scr->osd.show = true;
                 scr->osd.shown_for |= CAMU_OSD_SEEK;
             }
-            if (scr->last_pointer_y >= scr->height - SCREEN_OSD_BAR_HEIGHT) {
+            if (scr->osd.duration > 0 && scr->last_pointer_y >= scr->height - OSD_BAR_HEIGHT) {
                 scr->osd.bar_mode = CAMU_OSD_BAR_SEEK;
             }
             break;
@@ -418,7 +418,7 @@ static bool key_callback(void *userdata, u8 state, u16 button)
             scr->callback(scr->userdata, CAMU_SCREEN_TOGGLE_PAUSE, NULL);
             break;
         case STELA_KEY_S:
-            if (SCREEN_MOD1(scr)) {
+            if (MOD1(scr)) {
                 scr->callback(scr->userdata, CAMU_SCREEN_SHUFFLE, NULL);
             } else {
 #ifdef CAMU_HAVE_SUBTITLES
@@ -432,7 +432,7 @@ static bool key_callback(void *userdata, u8 state, u16 button)
             scr->callback(scr->userdata, CAMU_SCREEN_RESEEK, NULL);
             break;
         case STELA_KEY_M: {
-            f32 volume = SCREEN_MOD2(scr) ? 1.f : -1.f;
+            f32 volume = MOD2(scr) ? 1.f : -1.f;
             scr->callback(scr->userdata, CAMU_SCREEN_SET_VOLUME, &volume);
             scr->osd.bar_mode = CAMU_OSD_BAR_VOLUME;
             scr->osd.bar = volume;
@@ -454,7 +454,7 @@ static bool key_callback(void *userdata, u8 state, u16 button)
         case STELA_KEY_R: {
             struct camu_view *view = get_view_from_mouse_pos(scr);
             if (view) {
-                if (SCREEN_MOD2(scr)) {
+                if (MOD2(scr)) {
                     switch (view->rotation) {
                     case CAMU_VIEW_ROTATION_0:
                     case CAMU_VIEW_ROTATION_360:
@@ -470,7 +470,7 @@ static bool key_callback(void *userdata, u8 state, u16 button)
                         view->rotation = CAMU_VIEW_ROTATION_180;
                         break;
                     }
-                } else if (SCREEN_MOD1(scr)) {
+                } else if (MOD1(scr)) {
                     switch (view->rotation) {
                     case CAMU_VIEW_ROTATION_0:
                     case CAMU_VIEW_ROTATION_360:
@@ -544,12 +544,12 @@ static bool key_callback(void *userdata, u8 state, u16 button)
             atomic_add(u32)(&scr->force_refresh, 1, AL_ATOMIC_RELAXED);
             return true;
         case STELA_KEY_V: {
-            if (SCREEN_MOD1(scr)) {
+            if (MOD1(scr)) {
                 scr->vr_calibrate_x = scr->last_pointer_x / scr->width;
                 scr->vr_calibrate_y = scr->last_pointer_y / scr->height;
             } else {
                 struct camu_view *view = get_view_from_mouse_pos(scr);
-                if (SCREEN_MOD2(scr) && scr->vr_emulation == CAMU_VR_180) {
+                if (MOD2(scr) && scr->vr_emulation == CAMU_VR_180) {
                     scr->vr_emulation = CAMU_VR_360;
                     log_info("VR 360 degrees.");
                     break;
@@ -558,7 +558,7 @@ static bool key_callback(void *userdata, u8 state, u16 button)
                     if (view) view->mode = CAMU_VIEW_AUTOFIT;
                     scr->flags = (scr->flags & ~CAMU_SCREEN_ZOOM_PAN_SIMPLE) | CAMU_SCREEN_ZOOM_FOV;
                     scr->window->set_cursor(scr->window, STELA_CURSOR_HIDDEN);
-                    scr->vr_emulation = SCREEN_MOD2(scr) ? CAMU_VR_360 : CAMU_VR_180;
+                    scr->vr_emulation = MOD2(scr) ? CAMU_VR_360 : CAMU_VR_180;
                     log_info("VR %s degrees.", (scr->vr_emulation == CAMU_VR_180) ? "180" : "360");
                 } else {
                     if (view) view->mode = CAMU_DEFAULT_VIEW;
@@ -610,8 +610,8 @@ static bool key_immediate_callback(void *userdata, u8 state, u16 button)
         case STELA_KEY_F:
             // On X11 and Wayland, MOUSE2 will be forcefully released when entering fullscreen.
             scr->fullscreen = !scr->fullscreen;
-            bool want_crosshair = SCREEN_MOUSE_MOD(scr) && scr->fullscreen;
-            scr->window->set_cursor(scr->window, want_crosshair ? STELA_CURSOR_CROSSHAIR : SCREEN_DEFAULT_CURSOR(scr));
+            bool want_crosshair = MOUSE_MOD(scr) && scr->fullscreen;
+            scr->window->set_cursor(scr->window, want_crosshair ? STELA_CURSOR_CROSSHAIR : DEFAULT_CURSOR(scr));
 //#ifdef STELA_API_DX11
 #if 0 // Stela's window_win32 fullscreen mode (borderless) is likely more desirable here.
             scr->renderer->set(scr->renderer, CAMU_RENDERER_FULLSCREEN, scr->fullscreen);
@@ -674,7 +674,7 @@ bool camu_screen_init(struct camu_screen *scr)
 #ifdef CAMU_HAVE_SUBTITLES
     scr->subtitles_enabled = true;
 #endif
-    scr->last_click_ts = SCREEN_INVALID_TS;
+    scr->last_click_ts = INVALID_TS;
     scr->last_pointer_x = 0.0;
     scr->last_pointer_y = 0.0;
 #ifdef CAMU_SCREEN_DRAG_SEEK
@@ -954,7 +954,7 @@ bool camu_screen_tick(struct camu_screen *scr, bool *force)
     }
     bool was_paused = scr->osd.paused;
     scr->callback(scr->userdata, CAMU_SCREEN_STATUS, &scr->osd);
-    if (!SCREEN_MOD1(scr)) {
+    if (!MOD1(scr)) {
         if (scr->osd.flash >= 0.0) {
             if (nn_get_tick() >= scr->osd.flash) {
                 scr->osd.flash = -1.0;