libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #33 from ficoos/linux_screensaver

Browse Source 
Linux screensaver
This commit is contained in:
Squarepusher 2012-07-26 14:54:59 -07:00
commit f2e22e4b70
4 changed files with 98 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gfx/gfx_common.c
View File

@ -1,6 +1,6 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2012 - Hans-Kristian Arntzen
*
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
@ -33,6 +33,12 @@
#endif
#endif
#if IS_LINUX
#include <unistd.h>
#include <errno.h>
#include <sys/wait.h>
#endif
#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) || defined(_MSC_VER)
static int gettimeofday(struct timeval *val, void *dummy)
{
@ -107,6 +113,37 @@ bool gfx_window_title(char *buf, size_t size)
return ret;
}
#ifdef IS_LINUX
void suspend_screensaver(Window wnd) {
char wid[20];
snprintf(wid, 20, "%d", (int) wnd);
wid[19] = '\0';
char* args[4];
args[0] = "xdg-screensaver";
args[1] = "suspend";
args[2] = wid;
args[3] = NULL;
int cpid = fork();
if (cpid < 0) {
RARCH_WARN("Could not suspend screen saver: %s\n", strerror(errno));
return;
}
if (!cpid) {
execvp(args[0], args);
exit(errno);
}
int err = 0;
waitpid(cpid, &err, 0);
if (err) {
RARCH_WARN("Could not suspend screen saver: %s\n", strerror(err));
}
}
#endif
#if defined(_WIN32) && !defined(_XBOX)
#include <windows.h>
#include "../dynamic.h"

7
gfx/gfx_common.h
View File

@ -1,6 +1,6 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2012 - Hans-Kristian Arntzen
*
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
@ -22,6 +22,11 @@
bool gfx_window_title(char *buf, size_t size);
void gfx_window_title_reset(void);
#ifdef IS_LINUX
#include <X11/Xlib.h>
void suspend_screensaver(Window wnd);
#endif
#ifdef _WIN32
void gfx_set_dwm(void);
#endif

30
gfx/sdl_gfx.c
View File

@ -21,6 +21,10 @@
#include "../input/rarch_sdl_input.h"
#include "gfx_common.h"
#ifdef IS_LINUX
#include "SDL_syswm.h"
#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@ -243,6 +247,21 @@ static void sdl_render_msg_32(sdl_video_t *vid, SDL_Surface *buffer, const char
#endif
}
#ifdef IS_LINUX
static Window sdl_get_window_id() {
SDL_SysWMinfo sys_info;
SDL_VERSION(&sys_info.version);
if(SDL_GetWMInfo(&sys_info) <= 0) {
RARCH_WARN("%s", SDL_GetError());
return -1;
}
Window wid = sys_info.info.x11.window;
return wid;
}
#endif
static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **input, void **input_data)
{
#ifdef _WIN32
@ -270,6 +289,13 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
vid->render32 = video->rgb32 && !g_settings.video.force_16bit;
vid->screen = SDL_SetVideoMode(video->width, video->height, vid->render32 ? 32 : 15, SDL_HWSURFACE | SDL_HWACCEL | SDL_DOUBLEBUF | (video->fullscreen ? SDL_FULLSCREEN : 0));
#ifdef IS_LINUX
int wid = sdl_get_window_id();
if (wid > 0) {
suspend_screensaver(wid);
}
#endif
if (!vid->screen && !g_settings.video.force_16bit && !video->rgb32)
{
vid->upsample = true;
@ -301,7 +327,7 @@ static void *sdl_gfx_init(const video_info_t *video, const input_driver_t **inpu
RARCH_SCALE_BASE * video->input_scale, 15,
fmt->Rmask, fmt->Gmask, fmt->Bmask, fmt->Amask);
}
RARCH_LOG("[Debug]: SDL Pixel format: Rshift = %u, Gshift = %u, Bshift = %u\n",
RARCH_LOG("[Debug]: SDL Pixel format: Rshift = %u, Gshift = %u, Bshift = %u\n",
(unsigned)fmt->Rshift, (unsigned)fmt->Gshift, (unsigned)fmt->Bshift);
if (!vid->buffer)
@ -491,7 +517,7 @@ static bool sdl_gfx_frame(void *data, const void *frame, unsigned width, unsigne
// 32-bit -> 32-bit
else
vid->convert_32_func((uint32_t*)vid->buffer->pixels, vid->buffer->pitch, (const uint32_t*)frame, width, height, pitch, vid->screen->format);
if (SDL_MUSTLOCK(vid->buffer))
SDL_UnlockSurface(vid->buffer);

50
gfx/xvideo.c
View File

@ -1,6 +1,6 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2012 - Hans-Kristian Arntzen
*
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
@ -109,7 +109,7 @@ static void init_yuv_tables(xv_t *xv)
xv->utable = (uint8_t*)malloc(0x8000);
xv->vtable = (uint8_t*)malloc(0x8000);
for (unsigned i = 0; i < 0x8000; i++)
for (unsigned i = 0; i < 0x8000; i++)
{
// Extract RGB555 color data from i
unsigned r = (i >> 10) & 0x1F, g = (i >> 5) & 0x1F, b = (i) & 0x1F;
@ -212,14 +212,14 @@ static void xv_init_font(xv_t *xv, const char *font_path, unsigned font_size)
}
// We render @ 2x scale to combat chroma downsampling. Also makes fonts more bearable :)
static void render16_yuy2(xv_t *xv, const void *input_, unsigned width, unsigned height, unsigned pitch)
static void render16_yuy2(xv_t *xv, const void *input_, unsigned width, unsigned height, unsigned pitch)
{
const uint16_t *input = (const uint16_t*)input_;
uint8_t *output = (uint8_t*)xv->image->data;
for (unsigned y = 0; y < height; y++)
for (unsigned y = 0; y < height; y++)
{
for (unsigned x = 0; x < width; x++)
for (unsigned x = 0; x < width; x++)
{
uint16_t p = *input++;
@ -240,14 +240,14 @@ static void render16_yuy2(xv_t *xv, const void *input_, unsigned width, unsigned
}
}
static void render16_uyvy(xv_t *xv, const void *input_, unsigned width, unsigned height, unsigned pitch)
static void render16_uyvy(xv_t *xv, const void *input_, unsigned width, unsigned height, unsigned pitch)
{
const uint16_t *input = (const uint16_t*)input_;
uint8_t *output = (uint8_t*)xv->image->data;
for (unsigned y = 0; y < height; y++)
for (unsigned y = 0; y < height; y++)
{
for (unsigned x = 0; x < width; x++)
for (unsigned x = 0; x < width; x++)
{
uint16_t p = *input++;
@ -268,7 +268,7 @@ static void render16_uyvy(xv_t *xv, const void *input_, unsigned width, unsigned
}
}
static void render32_yuy2(xv_t *xv, const void *input_, unsigned width, unsigned height, unsigned pitch)
static void render32_yuy2(xv_t *xv, const void *input_, unsigned width, unsigned height, unsigned pitch)
{
const uint32_t *input = (const uint32_t*)input_;
uint8_t *output = (uint8_t*)xv->image->data;
@ -297,12 +297,12 @@ static void render32_yuy2(xv_t *xv, const void *input_, unsigned width, unsigned
}
}
static void render32_uyvy(xv_t *xv, const void *input_, unsigned width, unsigned height, unsigned pitch)
static void render32_uyvy(xv_t *xv, const void *input_, unsigned width, unsigned height, unsigned pitch)
{
const uint32_t *input = (const uint32_t*)input_;
uint16_t *output = (uint16_t*)xv->image->data;
for (unsigned y = 0; y < height; y++)
for (unsigned y = 0; y < height; y++)
{
for (unsigned x = 0; x < width; x++)
{
@ -364,16 +364,16 @@ static bool adaptor_set_format(xv_t *xv, Display *dpy, XvPortID port, const vide
if (!format)
return false;
for (int i = 0; i < format_count; i++)
for (int i = 0; i < format_count; i++)
{
for (unsigned j = 0; j < sizeof(formats) / sizeof(formats[0]); j++)
{
if (format[i].type == XvYUV && format[i].bits_per_pixel == 16 && format[i].format == XvPacked)
if (format[i].type == XvYUV && format[i].bits_per_pixel == 16 && format[i].format == XvPacked)
{
if (format[i].component_order[0] == formats[j].components[0] &&
format[i].component_order[1] == formats[j].components[1] &&
format[i].component_order[2] == formats[j].components[2] &&
format[i].component_order[3] == formats[j].components[3])
format[i].component_order[3] == formats[j].components[3])
{
xv->fourcc = format[i].id;
xv->render_func = video->rgb32 ? formats[j].render_32 : formats[j].render_16;
@ -426,7 +426,7 @@ static void *xv_init(const video_info_t *video, const input_driver_t **input, vo
xv->port = 0;
XvAdaptorInfo *adaptor_info;
XvQueryAdaptors(xv->display, DefaultRootWindow(xv->display), &adaptor_count, &adaptor_info);
for (unsigned i = 0; i < adaptor_count; i++)
for (unsigned i = 0; i < adaptor_count; i++)
{
// Find adaptor that supports both input (memory->drawable) and image (drawable->screen) masks.
if (adaptor_info[i].num_formats < 1) continue;
@ -443,7 +443,7 @@ static void *xv_init(const video_info_t *video, const input_driver_t **input, vo
}
XvFreeAdaptorInfo(adaptor_info);
if (xv->port == 0)
if (xv->port == 0)
{
RARCH_ERR("XVideo: Failed to find valid XvPort or format.\n");
goto error;
@ -454,7 +454,7 @@ static void *xv_init(const video_info_t *video, const input_driver_t **input, vo
visualtemplate.depth = xv->depth;
visualtemplate.visual = 0;
visualinfo = XGetVisualInfo(xv->display, VisualIDMask | VisualScreenMask | VisualDepthMask, &visualtemplate, &visualmatches);
if (visualmatches < 1 || !visualinfo->visual)
if (visualmatches < 1 || !visualinfo->visual)
{
if (visualinfo) XFree(visualinfo);
RARCH_ERR("XVideo: Unable to find Xv-compatible visual.\n");
@ -495,7 +495,7 @@ static void *xv_init(const video_info_t *video, const input_driver_t **input, vo
xv->height = geom->max_height;
xv->image = XvShmCreateImage(xv->display, xv->port, xv->fourcc, NULL, xv->width, xv->height, &xv->shminfo);
if (!xv->image)
if (!xv->image)
{
RARCH_ERR("XVideo: XShmCreateImage failed.\n");
goto error;
@ -506,7 +506,7 @@ static void *xv_init(const video_info_t *video, const input_driver_t **input, vo
xv->shminfo.shmid = shmget(IPC_PRIVATE, xv->image->data_size, IPC_CREAT | 0777);
xv->shminfo.shmaddr = xv->image->data = (char*)shmat(xv->shminfo.shmid, NULL, 0);
xv->shminfo.readOnly = false;
if (!XShmAttach(xv->display, &xv->shminfo))
if (!XShmAttach(xv->display, &xv->shminfo))
{
RARCH_ERR("XVideo: XShmAttach failed.\n");
goto error;
@ -527,6 +527,8 @@ static void *xv_init(const video_info_t *video, const input_driver_t **input, vo
xv_set_nonblock_state(xv, !video->vsync);
xv->focus = true;
suspend_screensaver(xv->window);
xinput = input_x.init();
if (xinput)
{
@ -579,7 +581,7 @@ static bool check_resize(xv_t *xv, unsigned width, unsigned height)
xv->shminfo.shmaddr = xv->image->data = (char*)shmat(xv->shminfo.shmid, NULL, 0);
xv->shminfo.readOnly = false;
if (!XShmAttach(xv->display, &xv->shminfo))
{
RARCH_ERR("Failed to reattch XvShm image.\n");
@ -602,7 +604,7 @@ static void calc_out_rect(bool keep_aspect, unsigned *x, unsigned *y, unsigned *
float desired_aspect = g_settings.video.aspect_ratio;
float device_aspect = (float)vp_width / vp_height;
// If the aspect ratios of screen and desired aspect ratio are sufficiently equal (floating point stuff),
// If the aspect ratios of screen and desired aspect ratio are sufficiently equal (floating point stuff),
// assume they are actually equal.
if (fabs(device_aspect - desired_aspect) < 0.0001)
{
@ -741,7 +743,7 @@ static bool xv_alive(void *data)
XNextEvent(xv->display, &event);
switch (event.type)
{
case ClientMessage:
case ClientMessage:
if ((Atom)event.xclient.data.l[0] == xv->quit_atom)
return false;
break;
@ -776,9 +778,9 @@ static void xv_free(void *data)
shmctl(xv->shminfo.shmid, IPC_RMID, NULL);
XFree(xv->image);
if (xv->window)
if (xv->window)
XUnmapWindow(xv->display, xv->window);
if (xv->colormap)
if (xv->colormap)
XFreeColormap(xv->display, xv->colormap);
XCloseDisplay(xv->display);