mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove video_driver_has_windowed

Browse Source
This commit is contained in:
twinaphex 2015-11-20 15:20:54 +01:00
parent ba4643a7c1
commit 7141210d15
7 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command_event.c
View File

@ -1649,7 +1649,7 @@ bool event_command(enum event_command cmd)
#endif #endif
break; break;
case EVENT_CMD_FULLSCREEN_TOGGLE: case EVENT_CMD_FULLSCREEN_TOGGLE:
if (!video_driver_has_windowed()) if (!video_driver_ctl(RARCH_DISPLAY_CTL_HAS_WINDOWED, NULL))
return false; return false;
/* If we go fullscreen we drop all drivers and /* If we go fullscreen we drop all drivers and

15
gfx/video_driver.c
View File

@ -588,14 +588,6 @@ bool video_driver_suppress_screensaver(bool enable)
return video->suppress_screensaver(driver->video_data, enable); return video->suppress_screensaver(driver->video_data, enable);
} }
bool video_driver_has_windowed(void)
{
driver_t *driver = driver_get_ptr();
const video_driver_t *video = video_driver_ctx_get_ptr(driver);
return video->has_windowed(driver->video_data);
}
void video_driver_set_nonblock_state(bool toggle) void video_driver_set_nonblock_state(bool toggle)
{ {
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
@ -1199,6 +1191,13 @@ bool video_driver_ctl(enum rarch_display_ctl_state state, void *data)
{ {
switch (state) switch (state)
{ {
case RARCH_DISPLAY_CTL_HAS_WINDOWED:
{
driver_t *driver = driver_get_ptr();
const video_driver_t *video = video_driver_ctx_get_ptr(driver);
return video->has_windowed(driver->video_data);
}
case RARCH_DISPLAY_CTL_GET_FRAME_COUNT: case RARCH_DISPLAY_CTL_GET_FRAME_COUNT:
{ {
uint64_t **ptr = (uint64_t**)data; uint64_t **ptr = (uint64_t**)data;

3
gfx/video_driver.h
View File

@ -223,6 +223,7 @@ enum rarch_display_ctl_state
RARCH_DISPLAY_CTL_NONE = 0, RARCH_DISPLAY_CTL_NONE = 0,
RARCH_DISPLAY_CTL_FRAME_FILTER_ALIVE, RARCH_DISPLAY_CTL_FRAME_FILTER_ALIVE,
RARCH_DISPLAY_CTL_FRAME_FILTER_IS_32BIT, RARCH_DISPLAY_CTL_FRAME_FILTER_IS_32BIT,
RARCH_DISPLAY_CTL_HAS_WINDOWED,
RARCH_DISPLAY_CTL_GET_FRAME_COUNT RARCH_DISPLAY_CTL_GET_FRAME_COUNT
}; };
@ -287,8 +288,6 @@ void uninit_video_input(void);
void init_video(void); void init_video(void);
bool video_driver_has_windowed(void);
void video_driver_set_nonblock_state(bool toggle); void video_driver_set_nonblock_state(bool toggle);
bool video_driver_set_rotation(unsigned rotation); bool video_driver_set_rotation(unsigned rotation);

2
menu/drivers/materialui.c
View File

@ -883,7 +883,7 @@ static void mui_frame(void)
mui->box_message[0] = '\0'; mui->box_message[0] = '\0';
} }
if (settings->menu.mouse.enable && (settings->video.fullscreen || !video_driver_has_windowed())) if (settings->menu.mouse.enable && (settings->video.fullscreen || !video_driver_ctl(RARCH_DISPLAY_CTL_HAS_WINDOWED, NULL)))
{ {
int16_t mouse_x = menu_input_mouse_state(MENU_MOUSE_X_AXIS); int16_t mouse_x = menu_input_mouse_state(MENU_MOUSE_X_AXIS);
int16_t mouse_y = menu_input_mouse_state(MENU_MOUSE_Y_AXIS); int16_t mouse_y = menu_input_mouse_state(MENU_MOUSE_Y_AXIS);

2
menu/drivers/rgui.c
View File

@ -652,7 +652,7 @@ static void rgui_render(void)
rgui->force_redraw = true; rgui->force_redraw = true;
} }
if (settings->menu.mouse.enable && (settings->video.fullscreen || !video_driver_has_windowed())) if (settings->menu.mouse.enable && (settings->video.fullscreen || !video_driver_ctl(RARCH_DISPLAY_CTL_HAS_WINDOWED, NULL)))
rgui_blit_cursor(menu); rgui_blit_cursor(menu);
} }

2
menu/drivers/xmb.c
View File

@ -1822,7 +1822,7 @@ static void xmb_frame(void)
/* set alpha components of colors */ /* set alpha components of colors */
coord_color2[3] = coord_color2[7] = coord_color2[11] = coord_color2[15] = (1.00f > xmb->alpha) ? xmb->alpha : 1.00f; coord_color2[3] = coord_color2[7] = coord_color2[11] = coord_color2[15] = (1.00f > xmb->alpha) ? xmb->alpha : 1.00f;
if (settings->menu.mouse.enable && (settings->video.fullscreen || !video_driver_has_windowed())) if (settings->menu.mouse.enable && (settings->video.fullscreen || !video_driver_ctl(RARCH_DISPLAY_CTL_HAS_WINDOWED, NULL)))
{ {
int16_t mouse_x = menu_input_mouse_state(MENU_MOUSE_X_AXIS); int16_t mouse_x = menu_input_mouse_state(MENU_MOUSE_X_AXIS);
int16_t mouse_y = menu_input_mouse_state(MENU_MOUSE_Y_AXIS); int16_t mouse_y = menu_input_mouse_state(MENU_MOUSE_Y_AXIS);

6
menu/menu_setting.c
View File

@ -4018,7 +4018,7 @@ static bool setting_append_list_video_options(
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED); settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
#if !defined(RARCH_CONSOLE) && !defined(RARCH_MOBILE) #if !defined(RARCH_CONSOLE) && !defined(RARCH_MOBILE)
if (video_driver_has_windowed()) if (video_driver_ctl(RARCH_DISPLAY_CTL_HAS_WINDOWED, NULL))
{ {
CONFIG_BOOL( CONFIG_BOOL(
&settings->video.fullscreen, &settings->video.fullscreen,
@ -4036,7 +4036,7 @@ static bool setting_append_list_video_options(
settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO); settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO);
} }
#endif #endif
if (video_driver_has_windowed()) if (video_driver_ctl(RARCH_DISPLAY_CTL_HAS_WINDOWED, NULL))
{ {
CONFIG_BOOL( CONFIG_BOOL(
&settings->video.windowed_fullscreen, &settings->video.windowed_fullscreen,
@ -4228,7 +4228,7 @@ static bool setting_append_list_video_options(
START_SUB_GROUP(list, list_info, "Scaling", group_info.name, subgroup_info, parent_group); START_SUB_GROUP(list, list_info, "Scaling", group_info.name, subgroup_info, parent_group);
#if !defined(RARCH_CONSOLE) && !defined(RARCH_MOBILE) #if !defined(RARCH_CONSOLE) && !defined(RARCH_MOBILE)
if (video_driver_has_windowed()) if (video_driver_ctl(RARCH_DISPLAY_CTL_HAS_WINDOWED, NULL))
{ {
CONFIG_FLOAT( CONFIG_FLOAT(
settings->video.scale, settings->video.scale,