[MPlayer-cvslog] r35854 - in trunk/gui: interface.c ui/actions.c ui/menu.c ui/playbar.c wm/ws.c wm/ws.h

[ib]

Author: ib
Date: Thu Jan 24 17:56:44 2013
New Revision: 35854

Log:
Cosmetic: Rename ReDraw DrawHandler.

Modified:
   trunk/gui/interface.c
   trunk/gui/ui/actions.c
   trunk/gui/ui/menu.c
   trunk/gui/ui/playbar.c
   trunk/gui/wm/ws.c
   trunk/gui/wm/ws.h

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Jan 24 17:49:53 2013	(r35853)
+++ trunk/gui/interface.c	Thu Jan 24 17:56:44 2013	(r35854)
@@ -192,12 +192,12 @@ void guiInit(void)
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] mainWindow ID: 0x%x\n", (int)guiApp.mainWindow.WindowID);
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] videoWindow ID: 0x%x\n", (int)guiApp.videoWindow.WindowID);
 
-    guiApp.mainWindow.ReDraw       = (void *)uiMainDraw;
+    guiApp.mainWindow.DrawHandler  = (void *)uiMainDraw;
     guiApp.mainWindow.MouseHandler = uiMainMouseHandle;
     guiApp.mainWindow.KeyHandler   = uiMainKeyHandle;
     guiApp.mainWindow.DNDHandler   = uiDNDHandler;
 
-    guiApp.videoWindow.ReDraw       = (void *)uiVideoDraw;
+    guiApp.videoWindow.DrawHandler  = (void *)uiVideoDraw;
     guiApp.videoWindow.MouseHandler = uiVideoMouseHandle;
     guiApp.videoWindow.KeyHandler   = uiMainKeyHandle;
     guiApp.videoWindow.DNDHandler   = uiDNDHandler;

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Thu Jan 24 17:49:53 2013	(r35853)
+++ trunk/gui/ui/actions.c	Thu Jan 24 17:56:44 2013	(r35854)
@@ -225,7 +225,7 @@ void uiChangeSkin(char *name)
     wsWindowShape(&guiApp.mainWindow, guiApp.main.Mask.Image);
     wsWindowIcon(wsDisplay, guiApp.mainWindow.WindowID, &guiIcon);
 
-    guiApp.mainWindow.ReDraw       = (void *)uiMainDraw;
+    guiApp.mainWindow.DrawHandler  = (void *)uiMainDraw;
     guiApp.mainWindow.MouseHandler = uiMainMouseHandle;
     guiApp.mainWindow.KeyHandler   = uiMainKeyHandle;
     guiApp.mainWindow.DNDHandler   = uiDNDHandler;

Modified: trunk/gui/ui/menu.c
==============================================================================
--- trunk/gui/ui/menu.c	Thu Jan 24 17:49:53 2013	(r35853)
+++ trunk/gui/ui/menu.c	Thu Jan 24 17:56:44 2013	(r35854)
@@ -167,7 +167,7 @@ void uiMenuInit( void )
  mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[menu] menuWindow ID: 0x%x\n",(int)guiApp.menuWindow.WindowID );
 
  menuIsInitialized=True;
- guiApp.menuWindow.ReDraw=uiMenuDraw;
+ guiApp.menuWindow.DrawHandler=uiMenuDraw;
 // guiApp.menuWindow.MouseHandler=uiMenuMouseHandle;
 // guiApp.menuWindow.KeyHandler=uiMainKeyHandle;
  uiMenuRender=True; wsWindowRedraw( &guiApp.menuWindow );

Modified: trunk/gui/ui/playbar.c
==============================================================================
--- trunk/gui/ui/playbar.c	Thu Jan 24 17:49:53 2013	(r35853)
+++ trunk/gui/ui/playbar.c	Thu Jan 24 17:56:44 2013	(r35854)
@@ -263,7 +263,7 @@ void uiPlaybarInit( void )
 
  wsWindowShape( &guiApp.playbarWindow,guiApp.playbar.Mask.Image );
 
- guiApp.playbarWindow.ReDraw=(void *)uiPlaybarDraw;
+ guiApp.playbarWindow.DrawHandler=(void *)uiPlaybarDraw;
  guiApp.playbarWindow.MouseHandler=uiPlaybarMouseHandle;
  guiApp.playbarWindow.KeyHandler=uiMainKeyHandle;
 

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Thu Jan 24 17:49:53 2013	(r35853)
+++ trunk/gui/wm/ws.c	Thu Jan 24 17:56:44 2013	(r35854)
@@ -434,8 +434,8 @@ void wsEvent(XEvent *event)
 expose:
         wsWindowList[l]->State = i;
 
-        if (wsWindowList[l]->ReDraw)
-            wsWindowList[l]->ReDraw();
+        if (wsWindowList[l]->DrawHandler)
+            wsWindowList[l]->DrawHandler();
 
         break;
 
@@ -443,8 +443,8 @@ expose:
 
         wsWindowList[l]->State = wsWindowExpose;
 
-        if ((wsWindowList[l]->ReDraw) && (!event->xexpose.count))
-            wsWindowList[l]->ReDraw();
+        if ((wsWindowList[l]->DrawHandler) && (!event->xexpose.count))
+            wsWindowList[l]->DrawHandler();
 
         break;
 
@@ -923,7 +923,7 @@ void wsWindowCreate(wsWindow *win, int x
     XFlush(wsDisplay);
     XSync(wsDisplay, False);
 
-    win->ReDraw       = NULL;
+    win->DrawHandler  = NULL;
     win->MouseHandler = NULL;
     win->KeyHandler   = NULL;
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] window is created. ( %s ).\n", label);
@@ -938,7 +938,7 @@ void wsWindowDestroy(wsWindow *win)
     if (l != -1)
         wsWindowList[l] = NULL;
 
-    win->ReDraw       = NULL;
+    win->DrawHandler  = NULL;
     win->MouseHandler = NULL;
     win->KeyHandler   = NULL;
     win->DNDHandler   = NULL;
@@ -1310,9 +1310,9 @@ void wsWindowLayer(Display *display, Win
 // ----------------------------------------------------------------------------------------------
 void wsWindowRedraw(wsWindow *win)
 {
-    if (win->ReDraw) {
+    if (win->DrawHandler) {
         win->State = wsWindowExpose;
-        win->ReDraw();
+        win->DrawHandler();
         XFlush(wsDisplay);
     }
 }

Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h	Thu Jan 24 17:49:53 2013	(r35853)
+++ trunk/gui/wm/ws.h	Thu Jan 24 17:56:44 2013	(r35854)
@@ -85,7 +85,7 @@
 #define wsPVisible   5
 #define wsRolled     6
 
-typedef   void (*wsTReDraw)(void);
+typedef   void (*wsTDrawHandler)(void);
 typedef   void (*wsTKeyHandler)(int KeyCode, int Type, int Key);
 typedef   void (*wsTMouseHandler)(int Button, int X, int Y, int RX, int RY);
 typedef   void (*wsTDNDHandler)(int num, char **str);
@@ -108,7 +108,7 @@ typedef struct {
     int Focused;
     int Rolled;
 
-    wsTReDraw ReDraw;
+    wsTDrawHandler DrawHandler;
     wsTKeyHandler KeyHandler;
     wsTMouseHandler MouseHandler;
     wsTDNDHandler DNDHandler;