frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fb: fb{Map,Unmap}Window -> fb{Realize,Unrealize}Window 

Make the function names match the screen slot name.

Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2014-09-18 16:05:40 -04:00
parent 9ed83a694b
commit 5b07f1db6d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fb/fb.h
View File

@ -1621,13 +1621,13 @@ extern _X_EXPORT Bool
fbDestroyWindow(WindowPtr pWin); fbDestroyWindow(WindowPtr pWin);
extern _X_EXPORT Bool extern _X_EXPORT Bool
fbMapWindow(WindowPtr pWindow); fbRealizeWindow(WindowPtr pWindow);
extern _X_EXPORT Bool extern _X_EXPORT Bool
fbPositionWindow(WindowPtr pWin, int x, int y); fbPositionWindow(WindowPtr pWin, int x, int y);
extern _X_EXPORT Bool extern _X_EXPORT Bool
fbUnmapWindow(WindowPtr pWindow); fbUnrealizeWindow(WindowPtr pWindow);
extern _X_EXPORT void extern _X_EXPORT void

4
fb/fbscreen.c
View File

@ -110,8 +110,8 @@ fbSetupScreen(ScreenPtr pScreen, void *pbits, /* pointer to screen bitmap */
pScreen->DestroyWindow = fbDestroyWindow; pScreen->DestroyWindow = fbDestroyWindow;
pScreen->PositionWindow = fbPositionWindow; pScreen->PositionWindow = fbPositionWindow;
pScreen->ChangeWindowAttributes = fbChangeWindowAttributes; pScreen->ChangeWindowAttributes = fbChangeWindowAttributes;
pScreen->RealizeWindow = fbMapWindow; pScreen->RealizeWindow = fbRealizeWindow;
pScreen->UnrealizeWindow = fbUnmapWindow; pScreen->UnrealizeWindow = fbUnrealizeWindow;
pScreen->CopyWindow = fbCopyWindow; pScreen->CopyWindow = fbCopyWindow;
pScreen->CreatePixmap = fbCreatePixmap; pScreen->CreatePixmap = fbCreatePixmap;
pScreen->DestroyPixmap = fbDestroyPixmap; pScreen->DestroyPixmap = fbDestroyPixmap;

4
fb/fbwindow.c
View File

@ -46,7 +46,7 @@ fbDestroyWindow(WindowPtr pWin)
} }
Bool Bool
fbMapWindow(WindowPtr pWindow) fbRealizeWindow(WindowPtr pWindow)
{ {
return TRUE; return TRUE;
} }
@ -58,7 +58,7 @@ fbPositionWindow(WindowPtr pWin, int x, int y)
} }
Bool Bool
fbUnmapWindow(WindowPtr pWindow) fbUnrealizeWindow(WindowPtr pWindow)
{ {
return TRUE; return TRUE;
} }

4
fb/wfbrename.h
View File

@ -88,7 +88,6 @@
#define fbInstallColormap wfbInstallColormap #define fbInstallColormap wfbInstallColormap
#define fbLaneTable wfbLaneTable #define fbLaneTable wfbLaneTable
#define fbListInstalledColormaps wfbListInstalledColormaps #define fbListInstalledColormaps wfbListInstalledColormaps
#define fbMapWindow wfbMapWindow
#define FbMergeRopBits wFbMergeRopBits #define FbMergeRopBits wFbMergeRopBits
#define fbOddStipple wfbOddStipple #define fbOddStipple wfbOddStipple
#define fbOddTile wfbOddTile #define fbOddTile wfbOddTile
@ -134,6 +133,7 @@
#define fbQueryBestSize wfbQueryBestSize #define fbQueryBestSize wfbQueryBestSize
#define fbRasterizeTrapezoid wfbRasterizeTrapezoid #define fbRasterizeTrapezoid wfbRasterizeTrapezoid
#define fbRealizeFont wfbRealizeFont #define fbRealizeFont wfbRealizeFont
#define fbRealizeWindow wfbRealizeWindow
#define fbReduceRasterOp wfbReduceRasterOp #define fbReduceRasterOp wfbReduceRasterOp
#define fbReplicatePixel wfbReplicatePixel #define fbReplicatePixel wfbReplicatePixel
#define fbResolveColor wfbResolveColor #define fbResolveColor wfbResolveColor
@ -160,7 +160,7 @@
#define fbTrapezoids wfbTrapezoids #define fbTrapezoids wfbTrapezoids
#define fbTriangles wfbTriangles #define fbTriangles wfbTriangles
#define fbUninstallColormap wfbUninstallColormap #define fbUninstallColormap wfbUninstallColormap
#define fbUnmapWindow wfbUnmapWindow #define fbUnrealizeWindow wfbUnrealizeWindow
#define fbUnrealizeFont wfbUnrealizeFont #define fbUnrealizeFont wfbUnrealizeFont
#define fbValidateGC wfbValidateGC #define fbValidateGC wfbValidateGC
#define fbWinPrivateKeyRec wfbWinPrivateKeyRec #define fbWinPrivateKeyRec wfbWinPrivateKeyRec