From cf11376a6f371afa1b7bcfbc8b366a60e38ace8b Mon Sep 17 00:00:00 2001 From: Nicky Date: Fri, 26 Jul 2024 16:23:54 +0200 Subject: Post merge cleanup of Linux code --- indra/llwindow/llwindowsdl.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'indra/llwindow/llwindowsdl.h') diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h index 3ed2811572..3acda71157 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -285,7 +285,6 @@ protected: int mHaveInputFocus; /* 0=no, 1=yes, else unknown */ int mIsMinimized; /* 0=no, 1=yes, else unknown */ - int mIsActive; /* 0=no, 1=yes, else unknown */ friend class LLWindowManager; @@ -316,6 +315,8 @@ public: void clearSecondaryText() { mSecondaryClipboard.clear(); } private: + void tryFindFullscreenSize(int &aWidth, int &aHeight); + void initialiseX11Clipboard(); bool getSelectionText(Atom selection, LLWString &text); @@ -323,10 +324,8 @@ private: bool getSelectionText(Atom selection, Atom type, LLWString &text); bool setSelectionText(Atom selection, const LLWString &text); -#endif - - void tryFindFullscreenSize(int &aWidth, int &aHeight); +#endif LLWString mPrimaryClipboard; LLWString mSecondaryClipboard; }; -- cgit v1.2.3 From 031a29625d40215e8715e4eccac17578984c6907 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Sat, 27 Jul 2024 18:01:29 +0300 Subject: Fix trailing whitespace --- indra/llwindow/llwindowsdl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llwindow/llwindowsdl.h') diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h index 3acda71157..cdb8a888d5 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -177,7 +177,7 @@ public: void *getPlatformWindow() override; void bringToFront() override; - + void setLanguageTextInput(const LLCoordGL& pos) override; void spawnWebBrowser(const std::string &escaped_url, bool async) override; -- cgit v1.2.3 From 619fdda6279341fdb52f98c09c202cf038851a31 Mon Sep 17 00:00:00 2001 From: Ansariel Hiller Date: Wed, 4 Sep 2024 21:24:14 +0200 Subject: Fix name of vsync param in LLWindowSDL (#2502) --- indra/llwindow/llwindowsdl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llwindow/llwindowsdl.h') diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h index cdb8a888d5..36bdf0e80a 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -84,7 +84,7 @@ public: bool setSizeImpl(LLCoordWindow size) override; - bool switchContext(bool fullscreen, const LLCoordScreen &size, bool disable_vsync, + bool switchContext(bool fullscreen, const LLCoordScreen &size, bool enable_vsync, const LLCoordScreen *const posp = NULL) override; bool setCursorPosition(LLCoordWindow position) override; @@ -222,7 +222,7 @@ public: 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 fullscreen, bool clearBg, bool enable_vsync, bool use_gl, bool ignore_pixel_depth, U32 fsaa_samples); ~LLWindowSDL(); @@ -251,7 +251,7 @@ 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); + bool createContext(int x, int y, int width, int height, int bits, bool fullscreen, bool enable_vsync); void destroyContext(); -- cgit v1.2.3 From 2caab6e9aefc5c2538434af0c49d3bd398977c14 Mon Sep 17 00:00:00 2001 From: Rye Cogtail Date: Sat, 28 Sep 2024 23:38:11 -0400 Subject: Update SDL clipboard, icon flash, and url opening handlers to use native SDL functions --- indra/llwindow/llwindowsdl.h | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'indra/llwindow/llwindowsdl.h') diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h index 36bdf0e80a..f86a277391 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -182,8 +182,6 @@ public: 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 getDynamicFallbackFontList(); @@ -257,8 +255,6 @@ protected: void setupFailure(const std::string &text, const std::string &caption, U32 type); - void fixWindowSize(void); - U32 SDLCheckGrabbyKeys(U32 keysym, bool gain); bool SDLReallyCaptureInput(bool capture); @@ -289,45 +285,15 @@ protected: friend class LLWindowManager; private: -#if LL_X11 - - void x11_set_urgent(bool urgent); - bool mFlashing; LLTimer mFlashTimer; -#endif //LL_X11 - 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 -- cgit v1.2.3 From 643e3d13dda050e20ae4535f67f99a134d53419a Mon Sep 17 00:00:00 2001 From: Rye Cogtail Date: Sun, 29 Sep 2024 03:19:43 -0400 Subject: Clean up SDL window creation and fix various bugs Add support for Core and Debug GL context creation Fix window position support Fix vsync handling Add minimum GL context support --- indra/llwindow/llwindowsdl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llwindow/llwindowsdl.h') diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h index f86a277391..144216f658 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -219,7 +219,7 @@ public: protected: LLWindowSDL(LLWindowCallbacks *callbacks, - const std::string &title, int x, int y, int width, int height, U32 flags, + const std::string &title, const std::string& name, int x, int y, int width, int height, U32 flags, bool fullscreen, bool clearBg, bool enable_vsync, bool use_gl, bool ignore_pixel_depth, U32 fsaa_samples); -- cgit v1.2.3