(submit/rename-panoramix-sym) rename old symbol PANORAMIX to XINERAMA

PANORAMIX was the original working title of the extension, before it became
official standard. Just nobody cared about fixing the symbols to the official
naming.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

include/extinit.h

@@ -59,9 +59,9 @@ extern _X_EXPORT Bool noCompositeExtension;
 #endif
 
 /* required by: several video drivers (eg. vmware and sis) */
-#ifdef PANORAMIX
+#ifdef XINERAMA
 extern _X_EXPORT Bool noPanoramiXExtension;
-#endif
+#endif /* XINERAMA */
 
 #if defined(XV)
 extern _X_EXPORT Bool noXvExtension;

include/globals.h

@@ -29,8 +29,8 @@ extern _X_EXPORT char *SeatId;
 extern _X_EXPORT char *ConnectionInfo;
 extern _X_EXPORT sig_atomic_t inSignalContext;
 
-#ifdef PANORAMIX
+#ifdef XINERAMA
 extern _X_EXPORT Bool PanoramiXExtensionDisabledHack;
-#endif
+#endif /* XINERAMA */
 
 #endif                          /* !_XSERV_GLOBAL_H_ */

include/inputstr.h

@@ -223,13 +223,13 @@ typedef struct _SpriteRec {
     WindowPtr win;              /* window of logical position */
     HotSpot hot;                /* logical pointer position */
     HotSpot hotPhys;            /* physical pointer position */
-#ifdef PANORAMIX
+#ifdef XINERAMA
     ScreenPtr screen;           /* all others are in Screen 0 coordinates */
     RegionRec Reg1;             /* Region 1 for confining motion */
     RegionRec Reg2;             /* Region 2 for confining virtual motion */
     WindowPtr windows[MAXSCREENS];
     WindowPtr confineWin;       /* confine window */
-#endif
+#endif /* XINERAMA */
     /* The window trace information is used at dix/events.c to avoid having
      * to compute all the windows between the root and the current pointer
      * window each time a button or key goes down. The grabs on each of those

include/meson.build

@@ -212,7 +212,7 @@ if build_glx
     conf_data.set_quoted('DRI_DRIVER_PATH', dri_dep.get_variable(pkgconfig : 'dridriverdir'))
 endif
 conf_data.set('MITSHM', build_mitshm ? '1' : false)
-conf_data.set('PANORAMIX', build_xinerama ? '1' : false)
+conf_data.set('XINERAMA', build_xinerama ? '1' : false)
 conf_data.set('PRESENT', '1')
 conf_data.set('RANDR', '1')
 conf_data.set('RES', build_res ? '1' : false)

include/xorg-server.h.meson.in

@@ -69,7 +69,7 @@
 #mesondefine MITSHM
 
 /* Internal define for Xinerama */
-#mesondefine PANORAMIX
+#mesondefine XINERAMA
 
 /* Support Present extension */
 #mesondefine PRESENT