Rename sc_display to sc_texture

The sc_display component now only handles a texture. Rendering has been
moved to sc_screen.

PR #6651 <https://github.com/Genymobile/scrcpy/pull/6651>

app/meson.build

@@ -104,7 +104,6 @@ if usb_support
         'src/usb/keyboard_aoa.c',
         'src/usb/mouse_aoa.c',
         'src/usb/scrcpy_otg.c',
-        'src/usb/screen_otg.c',
         'src/usb/usb.c',
     ]
 endif
@@ -191,7 +190,8 @@ executable('scrcpy', src,
 datadir = get_option('datadir') # by default 'share'
 
 install_man('scrcpy.1')
-install_data('data/scrcpy.png',
+install_data('data/icon.png',
+             rename: 'scrcpy.png',
              install_dir: datadir / 'icons/hicolor/256x256/apps')
 install_data('data/zsh-completion/_scrcpy',
              install_dir: datadir / 'zsh/site-functions')
@@ -282,6 +282,6 @@ endif
 
 if meson.version().version_compare('>= 0.58.0')
        devenv = environment()
-       devenv.set('SCRCPY_ICON_DIR', meson.current_source_dir() / 'data')
+       devenv.set('SCRCPY_ICON_PATH', meson.current_source_dir() / 'data/icon.png')
        meson.add_devenv(devenv)
 endif

app/scrcpy.1

@@ -851,8 +851,8 @@ Path to adb.
 Device serial to use if no selector (\fB-s\fR, \fB-d\fR, \fB-e\fR or \fB\-\-tcpip=\fIaddr\fR) is specified.
 
 .TP
-.B SCRCPY_ICON_DIR
-Path to the icon directory.
+.B SCRCPY_ICON_PATH
+Path to the program icon.
 
 .TP
 .B SCRCPY_SERVER_PATH

app/src/cli.c

@@ -1249,8 +1249,8 @@ static const struct sc_envvar envvars[] = {
                 "--tcpip=<addr>) is specified",
     },
     {
-        .name = "SCRCPY_ICON_DIR",
-        .text = "Path to the icon directory",
+        .name = "SCRCPY_ICON_PATH",
+        .text = "Path to the program icon",
     },
     {
         .name = "SCRCPY_SERVER_PATH",

app/src/icon.c

@@ -14,23 +14,21 @@
 
 #include "config.h"
 #include "util/env.h"
-#include "util/file.h"
+#ifdef PORTABLE
+# include "util/file.h"
+#endif
 #include "util/log.h"
 
-#define SCRCPY_ICON_FILENAME "scrcpy.png"
+#define SCRCPY_PORTABLE_ICON_FILENAME "icon.png"
 #define SCRCPY_DEFAULT_ICON_PATH \
     PREFIX "/share/icons/hicolor/256x256/apps/scrcpy.png"
 
 static char *
 get_icon_path(void) {
-    char *icon_path;
-
-    char *icon_dir = sc_get_env("SCRCPY_ICON_DIR");
-    if (icon_dir) {
+    char *icon_path = sc_get_env("SCRCPY_ICON_PATH");
+    if (icon_path) {
         // if the envvar is set, use it
-        icon_path = sc_file_build_path(icon_dir, SCRCPY_ICON_FILENAME);
-        free(icon_dir);
-        LOGD("Using icon from SCRCPY_ICON_DIR: %s", icon_path);
+        LOGD("Using SCRCPY_ICON_PATH: %s", icon_path);
         return icon_path;
     }
 
@@ -42,7 +40,7 @@ get_icon_path(void) {
         return NULL;
     }
 #else
-    icon_path = sc_file_get_local_path(SCRCPY_ICON_FILENAME);
+    icon_path = sc_file_get_local_path(SCRCPY_PORTABLE_ICON_FILENAME);
     if (!icon_path) {
         LOGE("Could not get icon path");
         return NULL;
@@ -178,8 +176,8 @@ to_sdl_pixel_format(enum AVPixelFormat fmt) {
     }
 }
 
-SDL_Surface *
-sc_icon_load(const char *path) {
+static SDL_Surface *
+load_from_path(const char *path) {
     AVFrame *frame = decode_image(path);
     if (!frame) {
         return NULL;
@@ -276,19 +274,19 @@ error:
 }
 
 SDL_Surface *
-sc_icon_load_scrcpy(void) {
+scrcpy_icon_load(void) {
     char *icon_path = get_icon_path();
     if (!icon_path) {
         return NULL;
     }
 
-    SDL_Surface *icon = sc_icon_load(icon_path);
+    SDL_Surface *icon = load_from_path(icon_path);
     free(icon_path);
     return icon;
 }
 
 void
-sc_icon_destroy(SDL_Surface *icon) {
+scrcpy_icon_destroy(SDL_Surface *icon) {
     SDL_PropertiesID props = SDL_GetSurfaceProperties(icon);
     assert(props);
     AVFrame *frame = SDL_GetPointerProperty(props, "sc_frame", NULL);

app/src/icon.h

@@ -6,12 +6,9 @@
 #include <SDL3/SDL_surface.h>
 
 SDL_Surface *
-sc_icon_load(const char *path);
-
-SDL_Surface *
-sc_icon_load_scrcpy(void);
+scrcpy_icon_load(void);
 
 void
-sc_icon_destroy(SDL_Surface *icon);
+scrcpy_icon_destroy(SDL_Surface *icon);
 
 #endif

app/src/input_manager.c

@@ -16,8 +16,6 @@
 void
 sc_input_manager_init(struct sc_input_manager *im,
                       const struct sc_input_manager_params *params) {
-    // A key/mouse processor may not be present if there is no controller
-    assert((!params->kp && !params->mp && !params->gp) || params->controller);
     // A processor must have ops initialized
     assert(!params->kp || params->kp->ops);
     assert(!params->mp || params->mp->ops);
@@ -1166,8 +1164,8 @@ sc_input_manager_handle_event(struct sc_input_manager *im,
         case SDL_EVENT_GAMEPAD_BUTTON_UP:
             sc_input_manager_process_gamepad_button(im, &event->gbutton);
             break;
-        case SDL_EVENT_DROP_FILE: {
+        case SDL_EVENT_DROP_FILE:
             sc_input_manager_process_file(im, &event->drop);
-        }
+            break;
     }
 }

app/src/recorder.c

@@ -444,7 +444,7 @@ sc_recorder_process_packets(struct sc_recorder *recorder) {
     int ret = av_write_trailer(recorder->ctx);
     if (ret < 0) {
         LOGE("Failed to write trailer to %s", recorder->filename);
-        error = false;
+        error = true;
     }
 
 end:

app/src/scrcpy.c

@@ -564,7 +564,7 @@ scrcpy(struct scrcpy_options *options) {
 
     struct sc_file_pusher *fp = NULL;
 
-    if (options->video_playback && options->control) {
+    if (options->window && options->control) {
         if (!sc_file_pusher_init(&s->file_pusher, serial,
                                  options->push_target)) {
             goto end;

app/src/screen.c

@@ -144,8 +144,8 @@ sc_screen_is_relative_mode(struct sc_screen *screen) {
 }
 
 static void
-compute_rect(struct sc_size render_size, struct sc_size content_size,
-             bool can_upscale, SDL_FRect *rect) {
+compute_content_rect(struct sc_size render_size, struct sc_size content_size,
+                     bool can_upscale, SDL_FRect *rect) {
     if (is_optimal_size(render_size, content_size)) {
         rect->x = 0;
         rect->y = 0;
@@ -188,7 +188,8 @@ sc_screen_update_content_rect(struct sc_screen *screen) {
 
     struct sc_size render_size =
         sc_sdl_get_render_output_size(screen->renderer);
-    compute_rect(render_size, screen->content_size, can_upscale, &screen->rect);
+    compute_content_rect(render_size, screen->content_size, can_upscale,
+                         &screen->rect);
 }
 
 // render the texture to the renderer
@@ -206,15 +207,16 @@ sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
     SDL_Renderer *renderer = screen->renderer;
     sc_sdl_render_clear(renderer);
 
+    bool ok = false;
+    SDL_Texture *texture = screen->tex.texture;
+    if (!texture) {
+        LOGW("No texture to render");
+        goto end;
+    }
+
     SDL_FRect *geometry = &screen->rect;
     enum sc_orientation orientation = screen->orientation;
 
-    SDL_Texture *texture = sc_texture_get_sdl_texture(&screen->tex);
-    if (!texture) {
-        return;
-    }
-
-    bool ok;
     if (orientation == SC_ORIENTATION_0) {
         ok = SDL_RenderTexture(renderer, texture, NULL, geometry);
     } else {
@@ -243,6 +245,8 @@ sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
     if (!ok) {
         LOGE("Could not render texture: %s", SDL_GetError());
     }
+
+end:
     sc_sdl_render_present(renderer);
 }
 
@@ -417,6 +421,30 @@ sc_screen_init(struct sc_screen *screen,
         goto error_destroy_window;
     }
 
+#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
+    screen->gl_context = NULL;
+
+    // starts with "opengl"
+    const char *renderer_name = SDL_GetRendererName(screen->renderer);
+    bool use_opengl = renderer_name && !strncmp(renderer_name, "opengl", 6);
+    if (use_opengl) {
+        // Persuade macOS to give us something better than OpenGL 2.1.
+        // If we create a Core Profile context, we get the best OpenGL version.
+        bool ok = SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK,
+                                      SDL_GL_CONTEXT_PROFILE_CORE);
+        if (!ok) {
+            LOGW("Could not set a GL Core Profile Context");
+        }
+
+        LOGD("Creating OpenGL Core Profile context");
+        screen->gl_context = SDL_GL_CreateContext(screen->window);
+        if (!screen->gl_context) {
+            LOGE("Could not create OpenGL context: %s", SDL_GetError());
+            goto error_destroy_renderer;
+        }
+    }
+#endif
+
     bool mipmaps = params->video;
     ok = sc_texture_init(&screen->tex, screen->renderer, mipmaps);
     if (!ok) {
@@ -429,7 +457,7 @@ sc_screen_init(struct sc_screen *screen,
         goto error_destroy_texture;
     }
 
-    SDL_Surface *icon = sc_icon_load_scrcpy();
+    SDL_Surface *icon = scrcpy_icon_load();
     if (icon) {
         if (!SDL_SetWindowIcon(screen->window, icon)) {
             LOGW("Could not set window icon: %s", SDL_GetError());
@@ -449,13 +477,13 @@ sc_screen_init(struct sc_screen *screen,
         screen->content_size.height = icon->h;
         ok = sc_texture_set_from_surface(&screen->tex, icon);
         if (!ok) {
-            sc_icon_destroy(icon);
+            scrcpy_icon_destroy(icon);
             goto error_destroy_texture;
         }
     }
 
     if (icon) {
-        sc_icon_destroy(icon);
+        scrcpy_icon_destroy(icon);
     }
 
     screen->frame = av_frame_alloc();
@@ -520,6 +548,11 @@ sc_screen_init(struct sc_screen *screen,
 error_destroy_texture:
     sc_texture_destroy(&screen->tex);
 error_destroy_renderer:
+#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
+    if (screen->gl_context) {
+        SDL_GL_DestroyContext(screen->gl_context);
+    }
+#endif
     SDL_DestroyRenderer(screen->renderer);
 error_destroy_window:
     SDL_DestroyWindow(screen->window);
@@ -584,6 +617,9 @@ sc_screen_destroy(struct sc_screen *screen) {
 #endif
     sc_texture_destroy(&screen->tex);
     av_frame_free(&screen->frame);
+#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
+    SDL_GL_DestroyContext(screen->gl_context);
+#endif
     SDL_DestroyRenderer(screen->renderer);
     SDL_DestroyWindow(screen->window);
     sc_fps_counter_destroy(&screen->fps_counter);

app/src/screen.h

@@ -22,6 +22,10 @@
 #include "trait/frame_sink.h"
 #include "trait/mouse_processor.h"
 
+#ifdef __APPLE__
+# define SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
+#endif
+
 struct sc_screen {
     struct sc_frame_sink frame_sink; // frame sink trait
 
@@ -50,6 +54,10 @@ struct sc_screen {
 
     SDL_Window *window;
     SDL_Renderer *renderer;
+#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
+    SDL_GLContext gl_context;
+#endif
+
     struct sc_size frame_size;
     struct sc_size content_size; // rotated frame_size
 

app/src/texture.c

@@ -14,31 +14,9 @@ sc_texture_init(struct sc_texture *tex, SDL_Renderer *renderer, bool mipmaps) {
 
     tex->mipmaps = false;
 
-#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
-    display->gl_context = NULL;
-#endif
-
     // starts with "opengl"
     bool use_opengl = renderer_name && !strncmp(renderer_name, "opengl", 6);
     if (use_opengl) {
-
-#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
-        // Persuade macOS to give us something better than OpenGL 2.1.
-        // If we create a Core Profile context, we get the best OpenGL version.
-        bool ok = SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK,
-                                      SDL_GL_CONTEXT_PROFILE_CORE);
-        if (!ok) {
-            LOGW("Could not set a GL Core Profile Context");
-        }
-
-        LOGD("Creating OpenGL Core Profile context");
-        display->gl_context = SDL_GL_CreateContext(window);
-        if (!display->gl_context) {
-            LOGE("Could not create OpenGL context: %s", SDL_GetError());
-            return false;
-        }
-#endif
-
         struct sc_opengl *gl = &tex->gl;
         sc_opengl_init(gl);
 
@@ -69,9 +47,6 @@ sc_texture_init(struct sc_texture *tex, SDL_Renderer *renderer, bool mipmaps) {
 
 void
 sc_texture_destroy(struct sc_texture *tex) {
-#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
-    SDL_GL_DestroyContext(tex->gl_context);
-#endif
     if (tex->texture) {
         SDL_DestroyTexture(tex->texture);
     }
@@ -250,8 +225,3 @@ sc_texture_set_from_surface(struct sc_texture *tex, SDL_Surface *surface) {
 
     return true;
 }
-
-SDL_Texture *
-sc_texture_get_sdl_texture(struct sc_texture *tex) {
-    return tex->texture;
-}

app/src/texture.h

@@ -11,10 +11,6 @@
 #include "coords.h"
 #include "opengl.h"
 
-#ifdef __APPLE__
-# define SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
-#endif
-
 enum sc_texture_type {
     SC_TEXTURE_TYPE_FRAME,
     SC_TEXTURE_TYPE_ICON,
@@ -28,9 +24,6 @@ struct sc_texture {
     enum sc_texture_type texture_type;
 
     struct sc_opengl gl;
-#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
-    SDL_GLContext gl_context;
-#endif
 
     bool mipmaps;
     uint32_t texture_id; // only set if mipmaps is enabled
@@ -48,7 +41,4 @@ sc_texture_set_from_frame(struct sc_texture *tex, const AVFrame *frame);
 bool
 sc_texture_set_from_surface(struct sc_texture *tex, SDL_Surface *surface);
 
-SDL_Texture *
-sc_texture_get_sdl_texture(struct sc_texture *tex);
-
 #endif

app/src/usb/scrcpy_otg.c

@@ -9,7 +9,7 @@
 # include "adb/adb.h"
 #endif
 #include "events.h"
-#include "usb/screen_otg.h"
+#include "screen.h"
 #include "usb/aoa_hid.h"
 #include "usb/gamepad_aoa.h"
 #include "usb/keyboard_aoa.h"
@@ -23,7 +23,7 @@ struct scrcpy_otg {
     struct sc_mouse_aoa mouse;
     struct sc_gamepad_aoa gamepad;
 
-    struct sc_screen_otg screen_otg;
+    struct sc_screen screen;
 };
 
 static void
@@ -49,7 +49,7 @@ event_loop(struct scrcpy_otg *s) {
                 LOGD("User requested to quit");
                 return SCRCPY_EXIT_SUCCESS;
             default:
-                sc_screen_otg_handle_event(&s->screen_otg, &event);
+                sc_screen_handle_event(&s->screen, &event);
                 break;
         }
     }
@@ -88,13 +88,14 @@ scrcpy_otg(struct scrcpy_options *options) {
 
     enum scrcpy_exit_code ret = SCRCPY_EXIT_FAILURE;
 
-    struct sc_keyboard_aoa *keyboard = NULL;
-    struct sc_mouse_aoa *mouse = NULL;
-    struct sc_gamepad_aoa *gamepad = NULL;
+    struct sc_key_processor *kp = NULL;
+    struct sc_mouse_processor *mp = NULL;
+    struct sc_gamepad_processor *gp = NULL;
     bool usb_device_initialized = false;
     bool usb_connected = false;
     bool aoa_started = false;
     bool aoa_initialized = false;
+    bool screen_initialized = false;
 
 #ifdef _WIN32
     // On Windows, only one process could open a USB device
@@ -157,7 +158,7 @@ scrcpy_otg(struct scrcpy_options *options) {
         if (!ok) {
             goto end;
         }
-        keyboard = &s->keyboard;
+        kp = &s->keyboard.key_processor;
     }
 
     if (enable_mouse) {
@@ -165,12 +166,12 @@ scrcpy_otg(struct scrcpy_options *options) {
         if (!ok) {
             goto end;
         }
-        mouse = &s->mouse;
+        mp = &s->mouse.mouse_processor;
     }
 
     if (enable_gamepad) {
         sc_gamepad_aoa_init(&s->gamepad, &s->aoa);
-        gamepad = &s->gamepad;
+        gp = &s->gamepad.gamepad_processor;
     }
 
     ok = sc_aoa_start(&s->aoa);
@@ -184,10 +185,18 @@ scrcpy_otg(struct scrcpy_options *options) {
         window_title = usb_device.product ? usb_device.product : "scrcpy";
     }
 
-    struct sc_screen_otg_params params = {
-        .keyboard = keyboard,
-        .mouse = mouse,
-        .gamepad = gamepad,
+    struct sc_screen_params params = {
+        .video = false,
+        .camera = false,
+        .controller = false,
+        .fp = NULL,
+        .kp = kp,
+        .mp = mp,
+        .gp = gp,
+        .mouse_bindings = options->mouse_bindings,
+        .legacy_paste = false,
+        .clipboard_autosync = false,
+        .shortcut_mods = options->shortcut_mods,
         .window_title = window_title,
         .always_on_top = options->always_on_top,
         .window_x = options->window_x,
@@ -195,13 +204,17 @@ scrcpy_otg(struct scrcpy_options *options) {
         .window_width = options->window_width,
         .window_height = options->window_height,
         .window_borderless = options->window_borderless,
-        .shortcut_mods = options->shortcut_mods,
+        .orientation = SC_ORIENTATION_0,
+        .mipmaps = options->mipmaps,
+        .fullscreen = false,
+        .start_fps_counter = false,
     };
 
-    ok = sc_screen_otg_init(&s->screen_otg, &params);
+    ok = sc_screen_init(&s->screen, &params);
     if (!ok) {
         goto end;
     }
+    screen_initialized = true;
 
     // usb_device not needed anymore
     sc_usb_device_destroy(&usb_device);
@@ -216,13 +229,17 @@ end:
     }
     sc_usb_stop(&s->usb);
 
-    if (mouse) {
+    if (screen_initialized) {
+        sc_screen_interrupt(&s->screen);
+    }
+
+    if (mp) {
         sc_mouse_aoa_destroy(&s->mouse);
     }
-    if (keyboard) {
+    if (kp) {
         sc_keyboard_aoa_destroy(&s->keyboard);
     }
-    if (gamepad) {
+    if (gp) {
         sc_gamepad_aoa_destroy(&s->gamepad);
     }
 
@@ -243,5 +260,10 @@ end:
 
     sc_usb_destroy(&s->usb);
 
+    if (screen_initialized) {
+        sc_screen_join(&s->screen);
+        sc_screen_destroy(&s->screen);
+    }
+
     return ret;
 }

app/src/usb/screen_otg.c

@@ -1,326 +0,0 @@
-#include "screen_otg.h"
-
-#include <assert.h>
-#include <stddef.h>
-
-#include "icon.h"
-#include "options.h"
-#include "util/acksync.h"
-#include "util/log.h"
-#include "util/sdl.h"
-
-static void
-sc_screen_otg_render(struct sc_screen_otg *screen) {
-    sc_sdl_render_clear(screen->renderer);
-    if (screen->texture) {
-        bool ok =
-            SDL_RenderTexture(screen->renderer, screen->texture, NULL, NULL);
-        if (!ok) {
-            LOGW("Could not render texture: %s", SDL_GetError());
-        }
-    }
-    sc_sdl_render_present(screen->renderer);
-}
-
-bool
-sc_screen_otg_init(struct sc_screen_otg *screen,
-                   const struct sc_screen_otg_params *params) {
-    screen->keyboard = params->keyboard;
-    screen->mouse = params->mouse;
-    screen->gamepad = params->gamepad;
-
-    const char *title = params->window_title;
-    assert(title);
-
-    int x = params->window_x != SC_WINDOW_POSITION_UNDEFINED
-          ? params->window_x : (int) SDL_WINDOWPOS_UNDEFINED;
-    int y = params->window_y != SC_WINDOW_POSITION_UNDEFINED
-          ? params->window_y : (int) SDL_WINDOWPOS_UNDEFINED;
-    int width = params->window_width ? params->window_width : 256;
-    int height = params->window_height ? params->window_height : 256;
-
-    uint32_t window_flags = SDL_WINDOW_HIGH_PIXEL_DENSITY;
-    if (params->always_on_top) {
-        window_flags |= SDL_WINDOW_ALWAYS_ON_TOP;
-    }
-    if (params->window_borderless) {
-        window_flags |= SDL_WINDOW_BORDERLESS;
-    }
-
-    screen->window =
-        sc_sdl_create_window(title, x, y, width, height, window_flags);
-    if (!screen->window) {
-        LOGE("Could not create window: %s", SDL_GetError());
-        return false;
-    }
-
-    screen->renderer = SDL_CreateRenderer(screen->window, NULL);
-    if (!screen->renderer) {
-        LOGE("Could not create renderer: %s", SDL_GetError());
-        goto error_destroy_window;
-    }
-
-    SDL_Surface *icon = sc_icon_load_scrcpy();
-    if (icon) {
-        bool ok = SDL_SetWindowIcon(screen->window, icon);
-        if (!ok) {
-            LOGW("Could not set window icon: %s", SDL_GetError());
-        }
-
-        ok = SDL_SetRenderLogicalPresentation(screen->renderer, icon->w,
-                                              icon->h,
-                                         SDL_LOGICAL_PRESENTATION_LETTERBOX);
-        if (!ok) {
-            LOGW("Could not set renderer logical size: %s", SDL_GetError());
-            // don't fail
-        }
-
-        screen->texture = SDL_CreateTextureFromSurface(screen->renderer, icon);
-        sc_icon_destroy(icon);
-        if (!screen->texture) {
-            goto error_destroy_renderer;
-        }
-    } else {
-        screen->texture = NULL;
-        LOGW("Could not load icon");
-    }
-
-    sc_mouse_capture_init(&screen->mc, screen->window, params->shortcut_mods);
-
-    if (screen->mouse) {
-        // Capture mouse on start
-        sc_mouse_capture_set_active(&screen->mc, true);
-    }
-
-    return true;
-
-error_destroy_window:
-    SDL_DestroyWindow(screen->window);
-error_destroy_renderer:
-    SDL_DestroyRenderer(screen->renderer);
-
-    return false;
-}
-
-void
-sc_screen_otg_destroy(struct sc_screen_otg *screen) {
-    if (screen->texture) {
-        SDL_DestroyTexture(screen->texture);
-    }
-    SDL_DestroyRenderer(screen->renderer);
-    SDL_DestroyWindow(screen->window);
-}
-
-static void
-sc_screen_otg_process_key(struct sc_screen_otg *screen,
-                             const SDL_KeyboardEvent *event) {
-    assert(screen->keyboard);
-    struct sc_key_processor *kp = &screen->keyboard->key_processor;
-
-    struct sc_key_event evt = {
-        .action = sc_action_from_sdl_keyboard_type(event->type),
-        .keycode = sc_keycode_from_sdl(event->key),
-        .scancode = sc_scancode_from_sdl(event->scancode),
-        .repeat = event->repeat,
-        .mods_state = sc_mods_state_from_sdl(event->mod),
-    };
-
-    assert(kp->ops->process_key);
-    kp->ops->process_key(kp, &evt, SC_SEQUENCE_INVALID);
-}
-
-static void
-sc_screen_otg_process_mouse_motion(struct sc_screen_otg *screen,
-                                   const SDL_MouseMotionEvent *event) {
-    assert(screen->mouse);
-    struct sc_mouse_processor *mp = &screen->mouse->mouse_processor;
-
-    struct sc_mouse_motion_event evt = {
-        // .position not used for HID events
-        .xrel = event->xrel,
-        .yrel = event->yrel,
-        .buttons_state = sc_mouse_buttons_state_from_sdl(event->state),
-    };
-
-    assert(mp->ops->process_mouse_motion);
-    mp->ops->process_mouse_motion(mp, &evt);
-}
-
-static void
-sc_screen_otg_process_mouse_button(struct sc_screen_otg *screen,
-                                   const SDL_MouseButtonEvent *event) {
-    assert(screen->mouse);
-    struct sc_mouse_processor *mp = &screen->mouse->mouse_processor;
-
-    uint32_t sdl_buttons_state = SDL_GetMouseState(NULL, NULL);
-
-    struct sc_mouse_click_event evt = {
-        // .position not used for HID events
-        .action = sc_action_from_sdl_mousebutton_type(event->type),
-        .button = sc_mouse_button_from_sdl(event->button),
-        .buttons_state = sc_mouse_buttons_state_from_sdl(sdl_buttons_state),
-    };
-
-    assert(mp->ops->process_mouse_click);
-    mp->ops->process_mouse_click(mp, &evt);
-}
-
-static void
-sc_screen_otg_process_mouse_wheel(struct sc_screen_otg *screen,
-                                  const SDL_MouseWheelEvent *event) {
-    assert(screen->mouse);
-    struct sc_mouse_processor *mp = &screen->mouse->mouse_processor;
-
-    uint32_t sdl_buttons_state = SDL_GetMouseState(NULL, NULL);
-
-    struct sc_mouse_scroll_event evt = {
-        // .position not used for HID events
-        .hscroll = event->x,
-        .vscroll = event->y,
-        .buttons_state = sc_mouse_buttons_state_from_sdl(sdl_buttons_state),
-    };
-
-    assert(mp->ops->process_mouse_scroll);
-    mp->ops->process_mouse_scroll(mp, &evt);
-}
-
-static void
-sc_screen_otg_process_gamepad_device(struct sc_screen_otg *screen,
-                                     const SDL_GamepadDeviceEvent *event) {
-    assert(screen->gamepad);
-    struct sc_gamepad_processor *gp = &screen->gamepad->gamepad_processor;
-
-    if (event->type == SDL_EVENT_GAMEPAD_ADDED) {
-        SDL_Gamepad *sdl_gamepad = SDL_OpenGamepad(event->which);
-        if (!sdl_gamepad) {
-            LOGW("Could not open gamepad");
-            return;
-        }
-
-        SDL_Joystick *joystick = SDL_GetGamepadJoystick(sdl_gamepad);
-        if (!joystick) {
-            LOGW("Could not get gamepad joystick");
-            SDL_CloseGamepad(sdl_gamepad);
-            return;
-        }
-
-        struct sc_gamepad_device_event evt = {
-            .gamepad_id = SDL_GetJoystickID(joystick),
-        };
-        gp->ops->process_gamepad_added(gp, &evt);
-    } else if (event->type == SDL_EVENT_GAMEPAD_REMOVED) {
-        SDL_JoystickID id = event->which;
-
-        SDL_Gamepad *sdl_gamepad = SDL_GetGamepadFromID(id);
-        if (sdl_gamepad) {
-            SDL_CloseGamepad(sdl_gamepad);
-        } else {
-            LOGW("Unknown gamepad device removed");
-        }
-
-        struct sc_gamepad_device_event evt = {
-            .gamepad_id = id,
-        };
-        gp->ops->process_gamepad_removed(gp, &evt);
-    }
-}
-
-static void
-sc_screen_otg_process_gamepad_axis(struct sc_screen_otg *screen,
-                                   const SDL_GamepadAxisEvent *event) {
-    assert(screen->gamepad);
-    struct sc_gamepad_processor *gp = &screen->gamepad->gamepad_processor;
-
-    enum sc_gamepad_axis axis = sc_gamepad_axis_from_sdl(event->axis);
-    if (axis == SC_GAMEPAD_AXIS_UNKNOWN) {
-        return;
-    }
-
-    struct sc_gamepad_axis_event evt = {
-        .gamepad_id = event->which,
-        .axis = axis,
-        .value = event->value,
-    };
-    gp->ops->process_gamepad_axis(gp, &evt);
-}
-
-static void
-sc_screen_otg_process_gamepad_button(struct sc_screen_otg *screen,
-                                     const SDL_GamepadButtonEvent *event) {
-    assert(screen->gamepad);
-    struct sc_gamepad_processor *gp = &screen->gamepad->gamepad_processor;
-
-    enum sc_gamepad_button button = sc_gamepad_button_from_sdl(event->button);
-    if (button == SC_GAMEPAD_BUTTON_UNKNOWN) {
-        return;
-    }
-
-    struct sc_gamepad_button_event evt = {
-        .gamepad_id = event->which,
-        .action = sc_action_from_sdl_gamepad_button_type(event->type),
-        .button = button,
-    };
-    gp->ops->process_gamepad_button(gp, &evt);
-}
-
-void
-sc_screen_otg_handle_event(struct sc_screen_otg *screen, SDL_Event *event) {
-    if (sc_mouse_capture_handle_event(&screen->mc, event)) {
-        // The mouse capture handler consumed the event
-        return;
-    }
-
-    switch (event->type) {
-        case SDL_EVENT_WINDOW_EXPOSED:
-            sc_screen_otg_render(screen);
-            break;
-        case SDL_EVENT_KEY_DOWN:
-            if (screen->keyboard) {
-                sc_screen_otg_process_key(screen, &event->key);
-            }
-            break;
-        case SDL_EVENT_KEY_UP:
-            if (screen->keyboard) {
-                sc_screen_otg_process_key(screen, &event->key);
-            }
-            break;
-        case SDL_EVENT_MOUSE_MOTION:
-            if (screen->mouse) {
-                sc_screen_otg_process_mouse_motion(screen, &event->motion);
-            }
-            break;
-        case SDL_EVENT_MOUSE_BUTTON_DOWN:
-            if (screen->mouse) {
-                sc_screen_otg_process_mouse_button(screen, &event->button);
-            }
-            break;
-        case SDL_EVENT_MOUSE_BUTTON_UP:
-            if (screen->mouse) {
-                sc_screen_otg_process_mouse_button(screen, &event->button);
-            }
-            break;
-        case SDL_EVENT_MOUSE_WHEEL:
-            if (screen->mouse) {
-                sc_screen_otg_process_mouse_wheel(screen, &event->wheel);
-            }
-            break;
-        case SDL_EVENT_GAMEPAD_ADDED:
-        case SDL_EVENT_GAMEPAD_REMOVED:
-            // Handle device added or removed even if paused
-            if (screen->gamepad) {
-                sc_screen_otg_process_gamepad_device(screen, &event->gdevice);
-            }
-            break;
-        case SDL_EVENT_GAMEPAD_AXIS_MOTION:
-            if (screen->gamepad) {
-                sc_screen_otg_process_gamepad_axis(screen, &event->gaxis);
-            }
-            break;
-        case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
-        case SDL_EVENT_GAMEPAD_BUTTON_UP:
-            if (screen->gamepad) {
-                sc_screen_otg_process_gamepad_button(screen, &event->gbutton);
-            }
-            break;
-    }
-}

app/src/usb/screen_otg.h

@@ -1,52 +0,0 @@
-#ifndef SC_SCREEN_OTG_H
-#define SC_SCREEN_OTG_H
-
-#include "common.h"
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <SDL3/SDL.h>
-
-#include "mouse_capture.h"
-#include "usb/gamepad_aoa.h"
-#include "usb/keyboard_aoa.h"
-#include "usb/mouse_aoa.h"
-
-struct sc_screen_otg {
-    struct sc_keyboard_aoa *keyboard;
-    struct sc_mouse_aoa *mouse;
-    struct sc_gamepad_aoa *gamepad;
-
-    SDL_Window *window;
-    SDL_Renderer *renderer;
-    SDL_Texture *texture;
-
-    struct sc_mouse_capture mc;
-};
-
-struct sc_screen_otg_params {
-    struct sc_keyboard_aoa *keyboard;
-    struct sc_mouse_aoa *mouse;
-    struct sc_gamepad_aoa *gamepad;
-
-    const char *window_title;
-    bool always_on_top;
-    int16_t window_x; // accepts SC_WINDOW_POSITION_UNDEFINED
-    int16_t window_y; // accepts SC_WINDOW_POSITION_UNDEFINED
-    uint16_t window_width;
-    uint16_t window_height;
-    bool window_borderless;
-    uint8_t shortcut_mods; // OR of enum sc_shortcut_mod values
-};
-
-bool
-sc_screen_otg_init(struct sc_screen_otg *screen,
-                   const struct sc_screen_otg_params *params);
-
-void
-sc_screen_otg_destroy(struct sc_screen_otg *screen);
-
-void
-sc_screen_otg_handle_event(struct sc_screen_otg *screen, SDL_Event *event);
-
-#endif

app/src/util/file.c

@@ -5,25 +5,6 @@
 
 #include "util/log.h"
 
-char *
-sc_file_build_path(const char *dir, const char *name) {
-    size_t dir_len = strlen(dir);
-    size_t name_len = strlen(name);
-
-    size_t len = dir_len + name_len + 2; // +2: '/' and '\0'
-    char *path = malloc(len);
-    if (!path) {
-        LOG_OOM();
-        return NULL;
-    }
-
-    memcpy(path, dir, dir_len);
-    path[dir_len] = SC_PATH_SEPARATOR;
-    // namelen + 1 to copy the final '\0'
-    memcpy(&path[dir_len + 1], name, name_len + 1);
-    return path;
-}
-
 char *
 sc_file_get_local_path(const char *name) {
     char *executable_path = sc_file_get_executable_path();
@@ -44,9 +25,24 @@ sc_file_get_local_path(const char *name) {
 
     *p = '\0'; // modify executable_path in place
     char *dir = executable_path;
-    char *file_path = sc_file_build_path(dir, name);
+    size_t dirlen = strlen(dir);
+    size_t namelen = strlen(name);
+
+    size_t len = dirlen + namelen + 2; // +2: '/' and '\0'
+    char *file_path = malloc(len);
+    if (!file_path) {
+        LOG_OOM();
+        free(executable_path);
+        return NULL;
+    }
+
+    memcpy(file_path, dir, dirlen);
+    file_path[dirlen] = SC_PATH_SEPARATOR;
+    // namelen + 1 to copy the final '\0'
+    memcpy(&file_path[dirlen + 1], name, namelen + 1);
 
     free(executable_path);
 
     return file_path;
 }
+

app/src/util/file.h

@@ -40,15 +40,6 @@ sc_file_get_executable_path(void);
 char *
 sc_file_get_local_path(const char *name);
 
-/**
- * Return the concatenation of dir, the path separator and the filename.
- *
- * The result must be freed by the caller using free(). It may return NULL on
- * error.
- */
-char *
-sc_file_build_path(const char *dir, const char *filename);
-
 /**
  * Indicate if the file exists and is not a directory
  */

release/build_linux.sh

@@ -38,6 +38,6 @@ ninja -C "$LINUX_BUILD_DIR"
 # Group intermediate outputs into a 'dist' directory
 mkdir -p "$LINUX_BUILD_DIR/dist"
 cp "$LINUX_BUILD_DIR"/app/scrcpy "$LINUX_BUILD_DIR/dist/"
-cp app/data/scrcpy.png "$LINUX_BUILD_DIR/dist/"
+cp app/data/icon.png "$LINUX_BUILD_DIR/dist/"
 cp app/scrcpy.1 "$LINUX_BUILD_DIR/dist/"
 cp -r "$ADB_INSTALL_DIR"/. "$LINUX_BUILD_DIR/dist/"

release/build_macos.sh

@@ -38,6 +38,6 @@ ninja -C "$MACOS_BUILD_DIR"
 # Group intermediate outputs into a 'dist' directory
 mkdir -p "$MACOS_BUILD_DIR/dist"
 cp "$MACOS_BUILD_DIR"/app/scrcpy "$MACOS_BUILD_DIR/dist/"
-cp app/data/scrcpy.png "$MACOS_BUILD_DIR/dist/"
+cp app/data/icon.png "$MACOS_BUILD_DIR/dist/"
 cp app/scrcpy.1 "$MACOS_BUILD_DIR/dist/"
 cp -r "$ADB_INSTALL_DIR"/. "$MACOS_BUILD_DIR/dist/"

run

@@ -20,6 +20,6 @@ then
     exit 1
 fi
 
-SCRCPY_ICON_DIR="app/data" \
+SCRCPY_ICON_PATH="app/data/icon.png" \
 SCRCPY_SERVER_PATH="$BUILDDIR/server/scrcpy-server" \
 "$BUILDDIR/app/scrcpy" "$@"