Merge branch 'release/maint-b' into marchcat/b-merge

# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
#	indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
#	indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
#	indra/newview/llfilepicker.cpp

1 files changed, 222 insertions, 114 deletions

diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h
index e96fce92f5..d24739cbda 100644
--- a/indra/llwindow/llwindowsdl.h
+++ b/indra/llwindow/llwindowsdl.h
@@ -24,20 +24,20 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLWINDOWSDL_H
-#define LL_LLWINDOWSDL_H
+#ifndef LL_LLWINDOWSDL2_H
+#define LL_LLWINDOWSDL2_H
 
 // Simple Directmedia Layer (http://libsdl.org/) implementation of LLWindow class
 
 #include "llwindow.h"
 #include "lltimer.h"
 
-#include "SDL/SDL.h"
-#include "SDL/SDL_endian.h"
+#include "SDL2/SDL.h"
+#include "SDL2/SDL_endian.h"
 
 #if LL_X11
 // get X11-specific headers for use in low-level stuff like copy-and-paste support
-#include "SDL/SDL_syswm.h"
+#include "SDL2/SDL_syswm.h"
 #endif
 
 // AssertMacros.h does bad things.
@@ -46,83 +46,139 @@
 #undef require
 
 
-class LLWindowSDL : public LLWindow
-{
+class LLWindowSDL : public LLWindow {
 public:
-    /*virtual*/ void show();
-    /*virtual*/ void hide();
-    /*virtual*/ void close();
-    /*virtual*/ BOOL getVisible();
-    /*virtual*/ BOOL getMinimized();
-    /*virtual*/ BOOL getMaximized();
-    /*virtual*/ BOOL maximize();
-    /*virtual*/ void minimize();
-    /*virtual*/ void restore();
-    /*virtual*/ BOOL getFullscreen();
-    /*virtual*/ BOOL getPosition(LLCoordScreen *position);
-    /*virtual*/ BOOL getSize(LLCoordScreen *size);
-    /*virtual*/ BOOL getSize(LLCoordWindow *size);
-    /*virtual*/ BOOL setPosition(LLCoordScreen position);
-    /*virtual*/ BOOL setSizeImpl(LLCoordScreen size);
-    /*virtual*/ BOOL setSizeImpl(LLCoordWindow size);
-    /*virtual*/ BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL);
-    /*virtual*/ BOOL setCursorPosition(LLCoordWindow position);
-    /*virtual*/ BOOL getCursorPosition(LLCoordWindow *position);
-    /*virtual*/ void showCursor();
-    /*virtual*/ void hideCursor();
-    /*virtual*/ void showCursorFromMouseMove();
-    /*virtual*/ void hideCursorUntilMouseMove();
-    /*virtual*/ BOOL isCursorHidden();
-    /*virtual*/ void updateCursor();
-    /*virtual*/ void captureMouse();
-    /*virtual*/ void releaseMouse();
-    /*virtual*/ void setMouseClipping( BOOL b );
-    /*virtual*/ void setMinSize(U32 min_width, U32 min_height, bool enforce_immediately = true);
-
-    /*virtual*/ BOOL isClipboardTextAvailable();
-    /*virtual*/ BOOL pasteTextFromClipboard(LLWString &dst);
-    /*virtual*/ BOOL copyTextToClipboard(const LLWString & src);
-
-    /*virtual*/ BOOL isPrimaryTextAvailable();
-    /*virtual*/ BOOL pasteTextFromPrimary(LLWString &dst);
-    /*virtual*/ BOOL copyTextToPrimary(const LLWString & src);
-
-    /*virtual*/ void flashIcon(F32 seconds);
-    /*virtual*/ F32 getGamma();
-    /*virtual*/ BOOL setGamma(const F32 gamma); // Set the gamma
-    /*virtual*/ U32 getFSAASamples();
-    /*virtual*/ void setFSAASamples(const U32 samples);
-    /*virtual*/ BOOL restoreGamma();            // Restore original gamma table (before updating gamma)
-    /*virtual*/ ESwapMethod getSwapMethod() { return mSwapMethod; }
-    /*virtual*/ void processMiscNativeEvents();
-    /*virtual*/ void gatherInput();
-    /*virtual*/ void swapBuffers();
-    /*virtual*/ void restoreGLContext() {};
-
-    /*virtual*/ void delayInputProcessing() { };
+    void show() override;
+
+    void hide() override;
+
+    void close() override;
+
+    BOOL getVisible() override;
+
+    BOOL getMinimized() override;
+
+    BOOL getMaximized() override;
+
+    BOOL maximize() override;
+
+    void minimize() override;
+
+    void restore() override;
+
+    BOOL getFullscreen();
+
+    BOOL getPosition(LLCoordScreen *position) override;
+
+    BOOL getSize(LLCoordScreen *size) override;
+
+    BOOL getSize(LLCoordWindow *size) override;
+
+    BOOL setPosition(LLCoordScreen position) override;
+
+    BOOL setSizeImpl(LLCoordScreen size) override;
+
+    BOOL setSizeImpl(LLCoordWindow size) override;
+
+    BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync,
+                                   const LLCoordScreen *const posp = NULL) override;
+
+    BOOL setCursorPosition(LLCoordWindow position) override;
+
+    BOOL getCursorPosition(LLCoordWindow *position) override;
+
+    void showCursor() override;
+
+    void hideCursor() override;
+
+    void showCursorFromMouseMove() override;
+
+    void hideCursorUntilMouseMove() override;
+
+    BOOL isCursorHidden() override;
+
+    void updateCursor() override;
+
+    void captureMouse() override;
+
+    void releaseMouse() override;
+
+    void setMouseClipping(BOOL b) override;
+
+       void setMinSize(U32 min_width, U32 min_height, bool enforce_immediately = true) override;
+
+    BOOL isClipboardTextAvailable() override;
+
+    BOOL pasteTextFromClipboard(LLWString &dst) override;
+
+    BOOL copyTextToClipboard(const LLWString &src) override;
+
+    BOOL isPrimaryTextAvailable() override;
+
+    BOOL pasteTextFromPrimary(LLWString &dst) override;
+
+    BOOL copyTextToPrimary(const LLWString &src) override;
+
+    void flashIcon(F32 seconds) override;
+
+    F32 getGamma() override;
+
+    BOOL setGamma(const F32 gamma) override; // Set the gamma
+    U32 getFSAASamples() override;
+
+    void setFSAASamples(const U32 samples) override;
+
+    BOOL restoreGamma() override;            // Restore original gamma table (before updating gamma)
+    ESwapMethod getSwapMethod()  override { return mSwapMethod; }
+
+    void processMiscNativeEvents() override;
+
+    void gatherInput() override;
+
+    void swapBuffers() override;
+
+    void restoreGLContext() {};
+
+    void delayInputProcessing()  override {};
 
     // handy coordinate space conversion routines
-    /*virtual*/ BOOL convertCoords(LLCoordScreen from, LLCoordWindow *to);
-    /*virtual*/ BOOL convertCoords(LLCoordWindow from, LLCoordScreen *to);
-    /*virtual*/ BOOL convertCoords(LLCoordWindow from, LLCoordGL *to);
-    /*virtual*/ BOOL convertCoords(LLCoordGL from, LLCoordWindow *to);
-    /*virtual*/ BOOL convertCoords(LLCoordScreen from, LLCoordGL *to);
-    /*virtual*/ BOOL convertCoords(LLCoordGL from, LLCoordScreen *to);
+    BOOL convertCoords(LLCoordScreen from, LLCoordWindow *to) override;
+
+    BOOL convertCoords(LLCoordWindow from, LLCoordScreen *to) override;
+
+    BOOL convertCoords(LLCoordWindow from, LLCoordGL *to) override;
+
+    BOOL convertCoords(LLCoordGL from, LLCoordWindow *to) override;
+
+    BOOL convertCoords(LLCoordScreen from, LLCoordGL *to) override;
 
-    /*virtual*/ LLWindowResolution* getSupportedResolutions(S32 &num_resolutions);
-    /*virtual*/ F32 getNativeAspectRatio();
-    /*virtual*/ F32 getPixelAspectRatio();
-    /*virtual*/ void setNativeAspectRatio(F32 ratio) { mOverrideAspectRatio = ratio; }
+    BOOL convertCoords(LLCoordGL from, LLCoordScreen *to) override;
 
-    /*virtual*/ void beforeDialog();
-    /*virtual*/ void afterDialog();
+    LLWindowResolution *getSupportedResolutions(S32 &num_resolutions) override;
 
-    /*virtual*/ BOOL dialogColorPicker(F32 *r, F32 *g, F32 *b);
+    F32 getNativeAspectRatio() override;
 
-    /*virtual*/ void *getPlatformWindow();
-    /*virtual*/ void bringToFront();
+    F32 getPixelAspectRatio() override;
 
-    /*virtual*/ void spawnWebBrowser(const std::string& escaped_url, bool async);
+    void setNativeAspectRatio(F32 ratio)  override { mOverrideAspectRatio = ratio; }
+
+    void beforeDialog() override;
+
+    void afterDialog() override;
+
+    BOOL dialogColorPicker(F32 *r, F32 *g, F32 *b) override;
+
+    void *getPlatformWindow() override;
+
+    void bringToFront() override;
+    
+    void setLanguageTextInput(const LLCoordGL& pos) override;
+
+    void spawnWebBrowser(const std::string &escaped_url, bool async) override;
+
+    void openFile(const std::string &file_name);
+
+    void setTitle(const std::string title) override;
 
     static std::vector<std::string> getDynamicFallbackFontList();
 
@@ -132,40 +188,54 @@ public:
     Window mSDL_XWindowID;
     Display *mSDL_Display;
 #endif
+
     void (*Lock_Display)(void);
-    void (*Unlock_Display)(void);
 
-#if LL_GTK
-    // Lazily initialize and check the runtime GTK version for goodness.
-    static bool ll_try_gtk_init(void);
-#endif // LL_GTK
+    void (*Unlock_Display)(void);
 
 #if LL_X11
+
     static Window get_SDL_XWindowID(void);
-    static Display* get_SDL_Display(void);
+
+    static Display *get_SDL_Display(void);
+
 #endif // LL_X11
 
+    void *createSharedContext() override;
+
+    void makeContextCurrent(void *context) override;
+
+    void destroySharedContext(void *context) override;
+
+    void toggleVSync(bool enable_vsync) override;
+
+    U32 getAvailableVRAMMegabytes() override;
+
 protected:
-    LLWindowSDL(LLWindowCallbacks* callbacks,
-        const std::string& title, int x, int y, int width, int height, U32 flags,
-        BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl,
-        BOOL ignore_pixel_depth, U32 fsaa_samples);
+    LLWindowSDL(LLWindowCallbacks *callbacks,
+                const std::string &title, int x, int y, int width, int height, U32 flags,
+                BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl,
+                BOOL ignore_pixel_depth, U32 fsaa_samples);
+
     ~LLWindowSDL();
 
-    /*virtual*/ BOOL    isValid();
-    /*virtual*/ LLSD    getNativeKeyData();
+    BOOL isValid() override;
+
+    LLSD getNativeKeyData() override;
+
+    void initCursors();
 
-    void    initCursors();
-    void    quitCursors();
-    void    moveWindow(const LLCoordScreen& position,const LLCoordScreen& size);
+    void quitCursors();
+
+    void moveWindow(const LLCoordScreen &position, const LLCoordScreen &size);
 
     // Changes display resolution. Returns true if successful
-    BOOL    setDisplayResolution(S32 width, S32 height, S32 bits, S32 refresh);
+    BOOL setDisplayResolution(S32 width, S32 height, S32 bits, S32 refresh);
 
     // Go back to last fullscreen display resolution.
-    BOOL    setFullscreenResolution();
+    BOOL setFullscreenResolution();
 
-    BOOL    shouldPostQuit() { return mPostQuit; }
+    BOOL shouldPostQuit() { return mPostQuit; }
 
 protected:
     //
@@ -174,46 +244,84 @@ protected:
 
     // create or re-create the GL context/window.  Called from the constructor and switchContext().
     BOOL createContext(int x, int y, int width, int height, int bits, BOOL fullscreen, BOOL disable_vsync);
+
     void destroyContext();
-    void setupFailure(const std::string& text, const std::string& caption, U32 type);
+
+    void setupFailure(const std::string &text, const std::string &caption, U32 type);
+
     void fixWindowSize(void);
-    U32 SDLCheckGrabbyKeys(SDLKey keysym, BOOL gain);
+
+    U32 SDLCheckGrabbyKeys(U32 keysym, BOOL gain);
+
     BOOL SDLReallyCaptureInput(BOOL capture);
 
     //
     // Platform specific variables
     //
-    U32             mGrabbyKeyFlags;
-    int         mReallyCapturedCount;
-    SDL_Surface *   mWindow;
+    U32 mGrabbyKeyFlags;
+    int mReallyCapturedCount;
+
+    SDL_Window *mWindow;
+    SDL_Surface *mSurface;
+    SDL_GLContext mContext;
+    SDL_Cursor *mSDLCursors[UI_CURSOR_COUNT];
+
     std::string mWindowTitle;
-    double      mOriginalAspectRatio;
-    BOOL        mNeedsResize;       // Constructor figured out the window is too big, it needs a resize.
-    LLCoordScreen   mNeedsResizeSize;
-    F32         mOverrideAspectRatio;
-    F32     mGamma;
-    U32     mFSAASamples;
+    double mOriginalAspectRatio;
+    BOOL mNeedsResize;        // Constructor figured out the window is too big, it needs a resize.
+    LLCoordScreen mNeedsResizeSize;
+    F32 mOverrideAspectRatio;
+    F32 mGamma;
+    U32 mFSAASamples;
 
-    int     mSDLFlags;
+    int mSDLFlags;
 
-    SDL_Cursor* mSDLCursors[UI_CURSOR_COUNT];
-    int             mHaveInputFocus; /* 0=no, 1=yes, else unknown */
-    int             mIsMinimized; /* 0=no, 1=yes, else unknown */
+    int mHaveInputFocus; /* 0=no, 1=yes, else unknown */
+    int mIsMinimized; /* 0=no, 1=yes, else unknown */
 
     friend class LLWindowManager;
 
 private:
 #if LL_X11
+
     void x11_set_urgent(BOOL urgent);
+
     BOOL mFlashing;
     LLTimer mFlashTimer;
 #endif //LL_X11
 
-    U32 mKeyScanCode;
-        U32 mKeyVirtualKey;
-    SDLMod mKeyModifiers;
-};
+    U32 mKeyVirtualKey;
+    U32 mKeyModifiers;
+    std::string mInputType;
+
+public:
+#if LL_X11
+
+    static Display *getSDLDisplay();
 
+    LLWString const &getPrimaryText() const { return mPrimaryClipboard; }
+
+    LLWString const &getSecondaryText() const { return mSecondaryClipboard; }
+
+    void clearPrimaryText() { mPrimaryClipboard.clear(); }
+
+    void clearSecondaryText() { mSecondaryClipboard.clear(); }
+
+private:
+    void tryFindFullscreenSize(int &aWidth, int &aHeight);
+
+    void initialiseX11Clipboard();
+
+    bool getSelectionText(Atom selection, LLWString &text);
+
+    bool getSelectionText(Atom selection, Atom type, LLWString &text);
+
+    bool setSelectionText(Atom selection, const LLWString &text);
+
+#endif
+    LLWString mPrimaryClipboard;
+    LLWString mSecondaryClipboard;
+};
 
 class LLSplashScreenSDL : public LLSplashScreen
 {
@@ -221,9 +329,9 @@ public:
     LLSplashScreenSDL();
     virtual ~LLSplashScreenSDL();
 
-    /*virtual*/ void showImpl();
-    /*virtual*/ void updateImpl(const std::string& mesg);
-    /*virtual*/ void hideImpl();
+    void showImpl();
+    void updateImpl(const std::string& mesg);
+    void hideImpl();
 };
 
 S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 type);