Rename driver from wlshm to wayland

In anticipation of future Glamor support.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

4 files changed, 32 insertions, 36 deletions

diff --git a/configure.ac b/configure.ac
index 163b9d2..3688fed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,10 +22,10 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xf86-video-wlshm],
-        [0.3.4],
+AC_INIT([xf86-video-wayland],
+        [0.4.0],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=wayland],
-        [xf86-video-wlshm])
+        [xf86-video-wayland])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
@@ -63,11 +63,7 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
 
 # Checks for libraries.
-PKG_CHECK_MODULES(WAYLAND, [wayland-client])
-
-
-DRIVER_NAME=wlshm
-AC_SUBST([DRIVER_NAME])
+PKG_CHECK_MODULES(WAYLAND, [wayland-client >= 1.0])
 
 AC_CONFIG_FILES([
                 Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 7c84179..280943a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,11 +27,11 @@
 
 AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS)
 
-wlshm_drv_la_LTLIBRARIES = wlshm_drv.la
-wlshm_drv_la_LDFLAGS = -module -avoid-version
-wlshm_drv_ladir = @moduledir@/drivers
+wayland_drv_la_LTLIBRARIES = wayland_drv.la
+wayland_drv_la_LDFLAGS = -module -avoid-version
+wayland_drv_ladir = @moduledir@/drivers
 
-wlshm_drv_la_SOURCES = \
-         wlshm.c \
-         wlshm.h \
+wayland_drv_la_SOURCES = \
+         wayland.c \
+         wayland.h \
 	 compat-api.h
diff --git a/src/wlshm.c b/src/wayland.c
index 74eb5ce..281c9f1 100644
--- a/src/wlshm.c
+++ b/src/wayland.c
@@ -51,7 +51,7 @@
 /*
  * Driver data structures.
  */
-#include "wlshm.h"
+#include "wayland.h"
 #include "compat-api.h"
 
 #include <sys/mman.h>
@@ -387,7 +387,7 @@ wlshm_pre_init(ScrnInfoPtr pScrn, int flags)
 
     wlshm = wlshm_scrninfo_priv(pScrn);
 
-    pScrn->chipset = WLSHM_DRIVER_NAME;
+    pScrn->chipset = WAYLAND_DRIVER_NAME;
     pScrn->monitor = pScrn->confScreen->monitor;
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing Wayland SHM driver\n");
@@ -510,7 +510,7 @@ error:
 
 /* Mandatory */
 static Bool
-wlshm_probe(DriverPtr drv, int flags)
+wayland_probe(DriverPtr drv, int flags)
 {
     Bool found = FALSE;
     int count;
@@ -523,7 +523,7 @@ wlshm_probe(DriverPtr drv, int flags)
      * Find the config file Device sections that match this
      * driver, and return if there are none.
      */
-    count = xf86MatchDevice(WLSHM_DRIVER_NAME, &sections);
+    count = xf86MatchDevice(WAYLAND_DRIVER_NAME, &sections);
 
     if (count <= 0) {
 	return FALSE;
@@ -538,9 +538,9 @@ wlshm_probe(DriverPtr drv, int flags)
 
         xf86AddEntityToScreen(pScrn, entityIndex);
         pScrn->driverVersion = COMBINED_DRIVER_VERSION;
-        pScrn->driverName    = WLSHM_DRIVER_NAME;
-        pScrn->name          = WLSHM_DRIVER_NAME;
-        pScrn->Probe         = wlshm_probe;
+        pScrn->driverName    = WAYLAND_DRIVER_NAME;
+        pScrn->name          = WAYLAND_DRIVER_NAME;
+        pScrn->Probe         = wayland_probe;
         pScrn->PreInit       = wlshm_pre_init;
         pScrn->ScreenInit    = wlshm_screen_init;
         pScrn->SwitchMode    = wlshm_switch_mode;
@@ -559,7 +559,7 @@ wlshm_probe(DriverPtr drv, int flags)
 }
 
 static const OptionInfoRec *
-wlshm_available_options(int chipid, int busid)
+wayland_available_options(int chipid, int busid)
 {
     return wlshm_options;
 }
@@ -569,7 +569,7 @@ wlshm_available_options(int chipid, int busid)
 #endif
 
 static Bool
-wlshm_driver_func(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr)
+wayland_driver_func(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr)
 {
     CARD32 *flag;
 
@@ -591,20 +591,20 @@ wlshm_driver_func(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr)
  * an upper-case version of the driver name.
  */
 
-_X_EXPORT DriverRec wlshm = {
+_X_EXPORT DriverRec wayland = {
     COMBINED_DRIVER_VERSION,
-    WLSHM_DRIVER_NAME,
+    WAYLAND_DRIVER_NAME,
     NULL,
-    wlshm_probe,
-    wlshm_available_options,
+    wayland_probe,
+    wayland_available_options,
     NULL,
     0,
-    wlshm_driver_func
+    wayland_driver_func
 };
 
-static XF86ModuleVersionInfo wlshm_vers_rec =
+static XF86ModuleVersionInfo wayland_vers_rec =
 {
-    WLSHM_DRIVER_NAME,
+    WAYLAND_DRIVER_NAME,
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
@@ -618,7 +618,7 @@ static XF86ModuleVersionInfo wlshm_vers_rec =
 
 
 static pointer
-wlshm_setup(pointer module, pointer opts, int *errmaj, int *errmin)
+wayland_setup(pointer module, pointer opts, int *errmaj, int *errmin)
 {
     static Bool initialized = FALSE;
 
@@ -629,7 +629,7 @@ wlshm_setup(pointer module, pointer opts, int *errmaj, int *errmin)
     }
 
     initialized = TRUE;
-    xf86AddDriver(&wlshm, module, HaveDriverFuncs);
+    xf86AddDriver(&wayland, module, HaveDriverFuncs);
 
     /*
      * The return value must be non-NULL on success even though there
@@ -642,8 +642,8 @@ wlshm_setup(pointer module, pointer opts, int *errmaj, int *errmin)
  * This is the module init data.
  * Its name has to be the driver name followed by ModuleData
  */
-_X_EXPORT XF86ModuleData wlshmModuleData = {
-    &wlshm_vers_rec,
-    wlshm_setup,
+_X_EXPORT XF86ModuleData waylandModuleData = {
+    &wayland_vers_rec,
+    wayland_setup,
     NULL
 };
diff --git a/src/wlshm.h b/src/wayland.h
index adb4e4b..deba3ef 100644
--- a/src/wlshm.h
+++ b/src/wayland.h
@@ -13,7 +13,7 @@
 
 #include "xwayland.h"
 
-#define WLSHM_DRIVER_NAME "wlshm"
+#define WAYLAND_DRIVER_NAME "wayland"
 #define COMBINED_DRIVER_VERSION \
     ((PACKAGE_VERSION_MAJOR << 16) | (PACKAGE_VERSION_MINOR << 8) | \
      PACKAGE_VERSION_PATCHLEVEL)