Mercurial > mplayer.hg

changeset 35760:1aedd24c032b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Rename ReDraw DrawHandler.
author ib
date Thu, 24 Jan 2013 16:56:44 +0000
parents afb55738b1b7
children fa2e5b53b2e3
files gui/interface.c gui/ui/actions.c gui/ui/menu.c gui/ui/playbar.c gui/wm/ws.c gui/wm/ws.h
diffstat 6 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Thu Jan 24 16:49:53 2013 +0000
+++ b/gui/interface.c	Thu Jan 24 16:56:44 2013 +0000
@@ -192,12 +192,12 @@
     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;
--- a/gui/ui/actions.c	Thu Jan 24 16:49:53 2013 +0000
+++ b/gui/ui/actions.c	Thu Jan 24 16:56:44 2013 +0000
@@ -225,7 +225,7 @@
     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;
--- a/gui/ui/menu.c	Thu Jan 24 16:49:53 2013 +0000
+++ b/gui/ui/menu.c	Thu Jan 24 16:56:44 2013 +0000
@@ -167,7 +167,7 @@
  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 );
--- a/gui/ui/playbar.c	Thu Jan 24 16:49:53 2013 +0000
+++ b/gui/ui/playbar.c	Thu Jan 24 16:56:44 2013 +0000
@@ -263,7 +263,7 @@
 
  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;
 
--- a/gui/wm/ws.c	Thu Jan 24 16:49:53 2013 +0000
+++ b/gui/wm/ws.c	Thu Jan 24 16:56:44 2013 +0000
@@ -434,8 +434,8 @@
 expose:
         wsWindowList[l]->State = i;
 
-        if (wsWindowList[l]->ReDraw)
-            wsWindowList[l]->ReDraw();
+        if (wsWindowList[l]->DrawHandler)
+            wsWindowList[l]->DrawHandler();
 
         break;
 
@@ -443,8 +443,8 @@
 
         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 @@
     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 @@
     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 wsWindowRedraw(wsWindow *win)
 {
-    if (win->ReDraw) {
+    if (win->DrawHandler) {
         win->State = wsWindowExpose;
-        win->ReDraw();
+        win->DrawHandler();
         XFlush(wsDisplay);
     }
 }
--- a/gui/wm/ws.h	Thu Jan 24 16:49:53 2013 +0000
+++ b/gui/wm/ws.h	Thu Jan 24 16:56:44 2013 +0000
@@ -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 @@
     int Focused;
     int Rolled;
 
-    wsTReDraw ReDraw;
+    wsTDrawHandler DrawHandler;
     wsTKeyHandler KeyHandler;
     wsTMouseHandler MouseHandler;
     wsTDNDHandler DNDHandler;