[MPlayer-cvslog] r35635 - in trunk/gui: app/app.c interface.c ui/render.c util/string.c wm/ws.c
ib
subversion at mplayerhq.hu
Sun Dec 9 14:19:42 CET 2012
Author: ib
Date: Sun Dec 9 14:19:42 2012
New Revision: 35635
Log:
Cosmetic: Add some blank lines.
Modified:
trunk/gui/app/app.c
trunk/gui/interface.c
trunk/gui/ui/render.c
trunk/gui/util/string.c
trunk/gui/wm/ws.c
Modified: trunk/gui/app/app.c
==============================================================================
--- trunk/gui/app/app.c Sun Dec 9 13:34:37 2012 (r35634)
+++ trunk/gui/app/app.c Sun Dec 9 14:19:42 2012 (r35635)
@@ -191,16 +191,19 @@ void btnModify(int event, float state)
if (guiApp.mainItems[i].message == event) {
switch (guiApp.mainItems[i].type) {
case itButton:
+
guiApp.mainItems[i].pressed = (int)state;
break;
case itPotmeter:
case itVPotmeter:
case itHPotmeter:
+
if (state < 0.0f)
state = 0.0f;
if (state > 100.0f)
state = 100.0f;
+
guiApp.mainItems[i].value = state;
break;
}
@@ -211,16 +214,19 @@ void btnModify(int event, float state)
if (guiApp.playbarItems[i].message == event) {
switch (guiApp.playbarItems[i].type) {
case itButton:
+
guiApp.playbarItems[i].pressed = (int)state;
break;
case itPotmeter:
case itVPotmeter:
case itHPotmeter:
+
if (state < 0.0f)
state = 0.0f;
if (state > 100.0f)
state = 100.0f;
+
guiApp.playbarItems[i].value = state;
break;
}
Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c Sun Dec 9 13:34:37 2012 (r35634)
+++ trunk/gui/interface.c Sun Dec 9 14:19:42 2012 (r35635)
@@ -354,6 +354,7 @@ int gui(int what, void *data)
switch (what) {
case GUI_SET_CONTEXT:
+
guiInfo.mpcontext = data;
break;
@@ -372,10 +373,13 @@ int gui(int what, void *data)
break;
case GUI_HANDLE_EVENTS:
+
if (!guiInfo.Playing || !guiInfo.VideoWindow)
wsHandleEvents();
+
wsAutohideCursor();
gtkEventHandling();
+
break;
case GUI_RUN_COMMAND:
@@ -407,10 +411,13 @@ int gui(int what, void *data)
break;
case GUI_RUN_MESSAGE:
+
mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] GUI_RUN_MESSAGE: %s\n", (const char *)data);
msg = appFindMessage((const char *)data);
+
if ((msg == evMenu) || appFindItem(msg))
uiEventHandling(msg, 0);
+
break;
case GUI_PREPARE:
@@ -664,6 +671,7 @@ int gui(int what, void *data)
break;
case GUI_SET_AFILTER:
+
guiInfo.afilter = data;
break;
@@ -752,9 +760,11 @@ int gui(int what, void *data)
guiInfo.Balance = (b + 1.0) * 50.0;
btnModify(evSetBalance, guiInfo.Balance);
}
+
break;
case GUI_REDRAW:
+
uiEventHandling(ivRedraw, 0);
break;
@@ -782,6 +792,7 @@ int gui(int what, void *data)
break;
case GUI_HANDLE_X_EVENT:
+
wsEvents(wsDisplay, data);
gtkEventHandling();
break;
Modified: trunk/gui/ui/render.c
==============================================================================
--- trunk/gui/ui/render.c Sun Dec 9 13:34:37 2012 (r35634)
+++ trunk/gui/ui/render.c Sun Dec 9 14:19:42 2012 (r35635)
@@ -332,35 +332,45 @@ void RenderAll(wsTWindow *window, wItem
switch (item->type) {
case itButton:
+
PutImage(&item->Bitmap, item->x, item->y, 3, ofs);
break;
case itPotmeter:
+
if (item->numphases == 1)
SimplePotmeterPutImage(&item->Bitmap, item->x, item->y, item->value / 100.0);
else
PutImage(&item->Bitmap, item->x, item->y, item->numphases, (item->numphases - 1) * (item->value / 100.0));
+
break;
case itHPotmeter:
+
if (item->numphases == 1)
SimplePotmeterPutImage(&item->Bitmap, item->x, item->y, item->value / 100.0);
else
PutImage(&item->Bitmap, item->x, item->y, item->numphases, (item->numphases - 1) * (item->value / 100.0));
+
PutImage(&item->Mask, item->x + (item->width - item->pwidth) * (item->value / 100.0), item->y, 3, ofs);
break;
case itVPotmeter:
+
PutImage(&item->Bitmap, item->x, item->y, item->numphases, item->numphases * (1.0 - item->value / 100.0));
PutImage(&item->Mask, item->x, item->y + (item->height - item->pheight) * (1.0 - item->value / 100.0), 3, ofs);
break;
case itSLabel:
+
if (item->width == -1)
item->width = fntTextWidth(item->fontid, item->label);
+
image = fntTextRender(item, 0, item->label);
+
if (image)
PutImage(image, item->x, item->y, 1, 0);
+
break;
case itDLabel:
Modified: trunk/gui/util/string.c
==============================================================================
--- trunk/gui/util/string.c Sun Dec 9 13:34:37 2012 (r35634)
+++ trunk/gui/util/string.c Sun Dec 9 14:19:42 2012 (r35635)
@@ -274,6 +274,7 @@ char *TranslateFilename(int how, char *f
switch (guiInfo.StreamType) {
case STREAMTYPE_FILE:
+
if (guiInfo.Filename && *guiInfo.Filename) {
p = strrchr(guiInfo.Filename,
#if HAVE_DOS_PATHS
@@ -297,28 +298,35 @@ char *TranslateFilename(int how, char *f
fname[len - 5] = 0;
} else
av_strlcpy(fname, MSGTR_NoFileLoaded, maxlen);
+
break;
case STREAMTYPE_STREAM:
+
av_strlcpy(fname, guiInfo.Filename, maxlen);
break;
case STREAMTYPE_CDDA:
+
snprintf(fname, maxlen, MSGTR_Title, guiInfo.Track);
break;
case STREAMTYPE_VCD:
+
snprintf(fname, maxlen, MSGTR_Title, guiInfo.Track - 1);
break;
case STREAMTYPE_DVD:
+
if (guiInfo.Chapter)
snprintf(fname, maxlen, MSGTR_Chapter, guiInfo.Chapter);
else
av_strlcpy(fname, MSGTR_NoChapter, maxlen);
+
break;
default:
+
av_strlcpy(fname, MSGTR_NoMediaOpened, maxlen);
break;
}
Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c Sun Dec 9 13:34:37 2012 (r35634)
+++ trunk/gui/wm/ws.c Sun Dec 9 14:19:42 2012 (r35635)
@@ -696,11 +696,13 @@ Bool wsEvents(Display *display, XEvent *
break;
case MapNotify:
+
i = wsWindowMapped;
wsWindowList[l]->Mapped = wsMapped;
goto expose;
case UnmapNotify:
+
i = wsWindowUnmapped;
wsWindowList[l]->Mapped = wsNo;
goto expose;
@@ -751,6 +753,7 @@ expose:
break;
case Expose:
+
wsWindowList[l]->State = wsWindowExpose;
if ((wsWindowList[l]->ReDraw) && (!Event->xexpose.count))
@@ -759,6 +762,7 @@ expose:
break;
case ConfigureNotify:
+
XTranslateCoordinates(wsDisplay, wsWindowList[l]->WindowID, wsRootWin, 0, 0, &x, &y, &child_window);
if ((wsWindowList[l]->X != x) || (wsWindowList[l]->Y != y) || (wsWindowList[l]->Width != Event->xconfigure.width) || (wsWindowList[l]->Height != Event->xconfigure.height)) {
@@ -782,10 +786,12 @@ expose:
break;
case KeyPress:
+
i = wsKeyPressed;
goto keypressed;
case KeyRelease:
+
i = wsKeyReleased;
keypressed:
wsWindowList[l]->Alt = False;
@@ -840,6 +846,7 @@ keypressed:
break;
case MotionNotify:
+
i = wsMoveMouse;
{
/* pump all motion events from the display queue:
@@ -855,36 +862,46 @@ keypressed:
}
}
}
+
if (wsWindowList[l]->wsCursor != None) {
wsVisibleMouse(wsWindowList[l], wsShowMouseCursor);
mouse_win = wsWindowList[l];
mouse_time = GetTimerMS();
}
+
goto buttonreleased;
case ButtonRelease:
+
i = Event->xbutton.button + 128;
+
if (wsWindowList[l]->wsCursor != None) {
wsVisibleMouse(wsWindowList[l], wsShowMouseCursor);
mouse_win = wsWindowList[l];
mouse_time = GetTimerMS();
}
+
goto buttonreleased;
case ButtonPress:
+
i = Event->xbutton.button;
+
if (wsWindowList[l]->wsCursor != None) {
wsVisibleMouse(wsWindowList[l], wsShowMouseCursor);
mouse_win = wsWindowList[l];
mouse_time = GetTimerMS();
}
+
goto buttonreleased;
case EnterNotify:
+
i = wsEnterWindow;
goto buttonreleased;
case LeaveNotify:
+
i = wsLeaveWindow;
buttonreleased:
@@ -894,6 +911,7 @@ buttonreleased:
break;
case SelectionNotify:
+
/* Handle DandD */
wsXDNDProcessSelection(wsWindowList[l], Event);
break;
@@ -901,6 +919,7 @@ buttonreleased:
XFlush(wsDisplay);
XSync(wsDisplay, False);
+
return !wsTrue;
}
@@ -1313,6 +1332,7 @@ void wsVisibleMouse(wsTWindow *win, int
break;
case wsHideMouseCursor:
+
win->wsCursor = XCreatePixmapCursor(wsDisplay, win->wsCursorPixmap, win->wsCursorPixmap, &win->wsColor, &win->wsColor, 0, 0);
XDefineCursor(wsDisplay, win->WindowID, win->wsCursor);
break;
@@ -1374,12 +1394,16 @@ void wsVisibleWindow(wsTWindow *win, int
{
switch (show) {
case wsShowWindow:
+
XMapRaised(wsDisplay, win->WindowID);
+
if (vo_fs_type & vo_wm_FULLSCREEN)
win->isFullScreen = False;
+
break;
case wsHideWindow:
+
XUnmapWindow(wsDisplay, win->WindowID);
break;
}
More information about the MPlayer-cvslog
mailing list