Mercurial > sdl-ios-xcode
view src/video/directfb/SDL_DirectFB_WM.c @ 5080:6d94060d16a9
Fixed bug #1011
Daniel Ellis 2010-06-25 15:20:31 PDT
SDL based applications sometimes display the wrong application name in the
Sound Preferences dialog when using pulseaudio.
I can see from the code that the SDL pulse module is initiating a new pulse
audio context and passing an application name using the function
get_progname().
The get_progname() function returns the name of the current process. However,
the process name is often not a suitable name to use. For example, the OpenShot
video editor is a python application, and so "python" is displayed in the Sound
Preferences window (see Bug #596504), when it should be displaying "OpenShot".
PulseAudio allows applications to specify the application name, either at the
time the context is created (as SDL does currently), or by special environment
variables (see http://www.pulseaudio.org/wiki/ApplicationProperties). If no
name is specified, then pulseaudio will determine the name based on the
process.
If you specify the application name when initiating the pulseaudio context,
then that will override any application name specified using an environment
variable.
As libsdl is a library, I believe the solution is for libsdl to not specify any
application name when initiating a pulseaudio context, which will enable
applications to specify the application name using environment variables. In
the case that the applications do not specify anything, pulseaudio will fall
back to using the process name anyway.
The attached patch removes the get_progname() function and passes NULL as the
application name when creating the pulseaudio context, which fixes the issue.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Sun, 23 Jan 2011 21:55:04 -0800 |
parents | b196d2758026 |
children | 164f20ba08eb |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2010 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" //#include "SDL_syswm.h" //#include "../SDL_sysvideo.h" //#include "../../events/SDL_keyboard_c.h" #include "SDL_DirectFB_video.h" #include "../../events/SDL_windowevents_c.h" #define COLOR_EXPAND(col) col.r, col.g, col.b, col.a static DFB_Theme theme_std = { 4, 4, 8, 8, {255, 200, 200, 200}, 24, {255, 0, 0, 255}, 16, {255, 255, 255, 255}, "/usr/share/fonts/truetype/freefont/FreeSans.ttf", {255, 255, 0, 0}, {255, 255, 255, 0}, }; static DFB_Theme theme_none = { 0, 0, 0, 0, {0, 0, 0, 0}, 0, {0, 0, 0, 0}, 0, {0, 0, 0, 0}, NULL }; static void DrawTriangle(IDirectFBSurface * s, int down, int x, int y, int w) { int x1, x2, x3; int y1, y2, y3; if (down) { x1 = x + w / 2; x2 = x; x3 = x + w; y1 = y + w; y2 = y; y3 = y; } else { x1 = x + w / 2; x2 = x; x3 = x + w; y1 = y; y2 = y + w; y3 = y + w; } s->FillTriangle(s, x1, y1, x2, y2, x3, y3); } static void LoadFont(_THIS, SDL_Window * window) { SDL_DFB_DEVICEDATA(_this); SDL_DFB_WINDOWDATA(window); if (windata->font != NULL) { SDL_DFB_RELEASE(windata->font); windata->font = NULL; SDL_DFB_CHECK(windata->window_surface->SetFont(windata->window_surface, windata->font)); } if (windata->theme.font != NULL) { DFBFontDescription fdesc; SDL_zero(fdesc); fdesc.flags = DFDESC_HEIGHT; fdesc.height = windata->theme.font_size; SDL_DFB_CHECK(devdata-> dfb->CreateFont(devdata->dfb, windata->theme.font, &fdesc, &windata->font)); SDL_DFB_CHECK(windata->window_surface->SetFont(windata->window_surface, windata->font)); } } static void DrawCraption(_THIS, IDirectFBSurface * s, int x, int y, char *text) { DFBSurfaceTextFlags flags; flags = DSTF_CENTER | DSTF_TOP; s->DrawString(s, text, -1, x, y, flags); } void DirectFB_WM_RedrawLayout(_THIS, SDL_Window * window) { SDL_DFB_WINDOWDATA(window); IDirectFBSurface *s = windata->window_surface; DFB_Theme *t = &windata->theme; int i; int d = (t->caption_size - t->font_size) / 2; int x, y, w; if (!windata->is_managed || (window->flags & SDL_WINDOW_FULLSCREEN)) return; LoadFont(_this, window); //s->SetDrawingFlags(s, DSDRAW_BLEND); s->SetColor(s, COLOR_EXPAND(t->frame_color)); /* top */ for (i = 0; i < t->top_size; i++) s->DrawLine(s, 0, i, windata->size.w, i); /* bottom */ for (i = windata->size.h - t->bottom_size; i < windata->size.h; i++) s->DrawLine(s, 0, i, windata->size.w, i); /* left */ for (i = 0; i < t->left_size; i++) s->DrawLine(s, i, 0, i, windata->size.h); /* right */ for (i = windata->size.w - t->right_size; i < windata->size.w; i++) s->DrawLine(s, i, 0, i, windata->size.h); /* Caption */ s->SetColor(s, COLOR_EXPAND(t->caption_color)); s->FillRectangle(s, t->left_size, t->top_size, windata->client.w, t->caption_size); /* Close Button */ w = t->caption_size; x = windata->size.w - t->right_size - w + d; y = t->top_size + d; s->SetColor(s, COLOR_EXPAND(t->close_color)); DrawTriangle(s, 1, x, y, w - 2 * d); /* Max Button */ s->SetColor(s, COLOR_EXPAND(t->max_color)); DrawTriangle(s, window->flags & SDL_WINDOW_MAXIMIZED ? 1 : 0, x - w, y, w - 2 * d); /* Caption */ if (window->title) { s->SetColor(s, COLOR_EXPAND(t->font_color)); DrawCraption(_this, s, (x - w) / 2, t->top_size + d, window->title); } /* Icon */ if (windata->icon) { DFBRectangle dr; dr.x = t->left_size + d; dr.y = t->top_size + d; dr.w = w - 2 * d; dr.h = w - 2 * d; s->SetBlittingFlags(s, DSBLIT_BLEND_ALPHACHANNEL); s->StretchBlit(s, windata->icon, NULL, &dr); } windata->wm_needs_redraw = 0; } DFBResult DirectFB_WM_GetClientSize(_THIS, SDL_Window * window, int *cw, int *ch) { SDL_DFB_WINDOWDATA(window); SDL_DFB_CHECK(windata->window->GetSize(windata->window, cw, ch)); *cw -= windata->theme.left_size + windata->theme.right_size; *ch -= windata->theme.top_size + windata->theme.caption_size + windata->theme.bottom_size; return DFB_OK; } void DirectFB_WM_AdjustWindowLayout(SDL_Window * window, int flags, int w, int h) { SDL_DFB_WINDOWDATA(window); if (!windata->is_managed) windata->theme = theme_none; else if (flags & SDL_WINDOW_FULLSCREEN) { windata->theme = theme_none; } else if (flags & SDL_WINDOW_MAXIMIZED) { windata->theme = theme_std; windata->theme.left_size = 0; windata->theme.right_size = 0; windata->theme.top_size = 0; windata->theme.bottom_size = 0; } else { windata->theme = theme_std; } windata->client.x = windata->theme.left_size; windata->client.y = windata->theme.top_size + windata->theme.caption_size; windata->client.w = w; windata->client.h = h; windata->size.w = w + windata->theme.left_size + windata->theme.right_size; windata->size.h = h + windata->theme.top_size + windata->theme.caption_size + windata->theme.bottom_size; } void DirectFB_WM_MaximizeWindow(_THIS, SDL_Window * window) { SDL_DFB_WINDOWDATA(window); SDL_VideoDisplay *display = window->display; SDL_DFB_CHECK(windata->window->GetPosition(windata->window, &windata->restore.x, &windata->restore.y)); SDL_DFB_CHECK(windata->window->GetSize(windata->window, &windata->restore.w, &windata->restore.h)); DirectFB_WM_AdjustWindowLayout(window, window->flags | SDL_WINDOW_MAXIMIZED, display->current_mode.w, display->current_mode.h) ; SDL_DFB_CHECK(windata->window->MoveTo(windata->window, 0, 0)); SDL_DFB_CHECK(windata->window->Resize(windata->window, display->current_mode.w, display->current_mode.h)); } void DirectFB_WM_RestoreWindow(_THIS, SDL_Window * window) { SDL_DFB_WINDOWDATA(window); DirectFB_WM_AdjustWindowLayout(window, window->flags & ~(SDL_WINDOW_MAXIMIZED | SDL_WINDOW_MINIMIZED), windata->restore.w, windata->restore.h); SDL_DFB_CHECK(windata->window->Resize(windata->window, windata->restore.w, windata->restore.h)); SDL_DFB_CHECK(windata->window->MoveTo(windata->window, windata->restore.x, windata->restore.y)); } enum { WM_POS_NONE = 0x00, WM_POS_CAPTION = 0x01, WM_POS_CLOSE = 0x02, WM_POS_MAX = 0x04, WM_POS_LEFT = 0x08, WM_POS_RIGHT = 0x10, WM_POS_TOP = 0x20, WM_POS_BOTTOM = 0x40, }; static int WMIsClient(DFB_WindowData * p, int x, int y) { x -= p->client.x; y -= p->client.y; if (x < 0 || y < 0) return 0; if (x >= p->client.w || y >= p->client.h) return 0; return 1; } static int WMPos(DFB_WindowData * p, int x, int y) { int pos = WM_POS_NONE; if (!WMIsClient(p, x, y)) { if (y < p->theme.top_size) { pos |= WM_POS_TOP; } else if (y < p->client.y) { if (x < p->size.w - p->theme.right_size - 2 * p->theme.caption_size) { pos |= WM_POS_CAPTION; } else if (x < p->size.w - p->theme.right_size - p->theme.caption_size) { pos |= WM_POS_MAX; } else { pos |= WM_POS_CLOSE; } } else if (y >= p->size.h - p->theme.bottom_size) { pos |= WM_POS_BOTTOM; } if (x < p->theme.left_size) { pos |= WM_POS_LEFT; } else if (x >= p->size.w - p->theme.right_size) { pos |= WM_POS_RIGHT; } } return pos; } static int wm_grab; static int wm_lastx; static int wm_lasty; int DirectFB_WM_ProcessEvent(_THIS, SDL_Window * window, DFBWindowEvent * evt) { SDL_DFB_DEVICEDATA(_this); SDL_DFB_WINDOWDATA(window); DFB_WindowData *gwindata = ((devdata->grabbed_window) ? (DFB_WindowData *) ((devdata->grabbed_window)->driverdata) : NULL); if (!windata->is_managed) return 0; switch (evt->type) { case DWET_BUTTONDOWN: if (evt->buttons & DIBM_LEFT) { int pos = WMPos(windata, evt->x, evt->y); switch (pos) { case WM_POS_NONE: return 0; case WM_POS_CLOSE: wm_grab = WM_POS_NONE; SDL_SendWindowEvent(window, SDL_WINDOWEVENT_CLOSE, 0, 0); return 1; case WM_POS_MAX: wm_grab = WM_POS_NONE; if (window->flags & SDL_WINDOW_MAXIMIZED) { SDL_RestoreWindow(window); } else { SDL_MaximizeWindow(window); } return 1; case WM_POS_CAPTION: DirectFB_RaiseWindow(_this, window); /* fall through */ default: wm_grab = pos; if (gwindata != NULL) SDL_DFB_CHECK(gwindata->window->UngrabPointer(gwindata->window)); SDL_DFB_CHECK(windata->window->GrabPointer(windata->window)); wm_lastx = evt->cx; wm_lasty = evt->cy; } } return 1; case DWET_BUTTONUP: break; case DWET_MOTION: if (!wm_grab) return 0; if (evt->buttons & DIBM_LEFT) { int dx = evt->cx - wm_lastx; int dy = evt->cy - wm_lasty; int cw, ch; if (wm_grab & WM_POS_CAPTION) SDL_DFB_CHECK(windata->window->Move(windata->window, dx, dy)); if (wm_grab & (WM_POS_RIGHT | WM_POS_BOTTOM)) { if ((wm_grab & (WM_POS_BOTTOM | WM_POS_RIGHT)) == WM_POS_BOTTOM) dx = 0; else if ((wm_grab & (WM_POS_BOTTOM | WM_POS_RIGHT)) == WM_POS_RIGHT) dy = 0; SDL_DFB_CHECK(windata->window->GetSize(windata->window, &cw, &ch)); SDL_DFB_CHECK(windata->window->Resize(windata->window, cw + dx, ch + dy)); } wm_lastx = evt->cx; wm_lasty = evt->cy; return 1; } SDL_DFB_CHECK(windata->window->UngrabPointer(windata->window)); if (gwindata != NULL) SDL_DFB_CHECK(gwindata->window->GrabPointer(gwindata->window)); wm_grab = WM_POS_NONE; break; case DWET_KEYDOWN: break; case DWET_KEYUP: break; default: ; } return 0; }