encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wayland: Fixed C99-style variable declaration inside for-loop.

This commit is contained in:
Ryan C. Gordon 2019-06-19 00:52:34 -04:00
parent 667c872b42
commit d0fa93d63c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/video/wayland/SDL_waylandwindow.c
View File

@ -345,6 +345,7 @@ static const struct qt_extended_surface_listener extended_surface_listener = {
static void static void
update_scale_factor(SDL_WindowData *window) { update_scale_factor(SDL_WindowData *window) {
float old_factor = window->scale_factor, new_factor = 0.0; float old_factor = window->scale_factor, new_factor = 0.0;
int i;
if (!(window->sdlwindow->flags & SDL_WINDOW_ALLOW_HIGHDPI)) { if (!(window->sdlwindow->flags & SDL_WINDOW_ALLOW_HIGHDPI)) {
return; return;
@ -358,7 +359,7 @@ update_scale_factor(SDL_WindowData *window) {
new_factor = ((SDL_WaylandOutputData*)(wl_output_get_user_data(window->sdlwindow->fullscreen_mode.driverdata)))->scale_factor; new_factor = ((SDL_WaylandOutputData*)(wl_output_get_user_data(window->sdlwindow->fullscreen_mode.driverdata)))->scale_factor;
} }
for (int i = 0; i < window->num_outputs; i++) { for (i = 0; i < window->num_outputs; i++) {
float factor = ((SDL_WaylandOutputData*)(wl_output_get_user_data(window->outputs[i])))->scale_factor; float factor = ((SDL_WaylandOutputData*)(wl_output_get_user_data(window->outputs[i])))->scale_factor;
if (factor > new_factor) { if (factor > new_factor) {
new_factor = factor; new_factor = factor;
@ -388,10 +389,11 @@ static void
handle_surface_leave(void *data, struct wl_surface *surface, handle_surface_leave(void *data, struct wl_surface *surface,
struct wl_output *output) { struct wl_output *output) {
SDL_WindowData *window = data; SDL_WindowData *window = data;
int i;
if (window->num_outputs > 1) { if (window->num_outputs > 1) {
struct wl_output **new_outputs = SDL_malloc((window->num_outputs - 1) * sizeof *window->outputs), **iter = new_outputs; struct wl_output **new_outputs = SDL_malloc((window->num_outputs - 1) * sizeof *window->outputs), **iter = new_outputs;
for (int i=0; i < window->num_outputs; i++) { for (i=0; i < window->num_outputs; i++) {
if (window->outputs[i] != output) { if (window->outputs[i] != output) {
*iter = window->outputs[i]; *iter = window->outputs[i];
iter++; iter++;
@ -640,7 +642,8 @@ int Wayland_CreateWindow(_THIS, SDL_Window *window)
data->scale_factor = 1.0; data->scale_factor = 1.0;
if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) { if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
for (int i=0; i < SDL_GetVideoDevice()->num_displays; i++) { int i;
for (i=0; i < SDL_GetVideoDevice()->num_displays; i++) {
float scale = ((SDL_WaylandOutputData*)SDL_GetVideoDevice()->displays[i].driverdata)->scale_factor; float scale = ((SDL_WaylandOutputData*)SDL_GetVideoDevice()->displays[i].driverdata)->scale_factor;
if (scale > data->scale_factor) { if (scale > data->scale_factor) {
data->scale_factor = scale; data->scale_factor = scale;