Second Life viewer sources 1.14.0.0

1 files changed, 53 insertions, 31 deletions

diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index 6b56df6..d3938e0 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -36,6 +36,10 @@
 #include "lldir.h"
 #include "llframetimer.h"
 
+#if LL_SDL
+#include "llwindowsdl.h" // for some X/GTK utils to help with filepickers
+#endif // LL_SDL
+
 //
 // Globals
 //
@@ -164,7 +168,7 @@ BOOL LLFilePicker::getOpenFile(ELoadFilter filter)
         if (success)
         {
                 LLString tstr = utf16str_to_utf8str(llutf16string(mFilesW));
-                memcpy(mFiles, tstr.c_str(), tstr.size()+1);
+                memcpy(mFiles, tstr.c_str(), tstr.size()+1); /*Flawfinder: ignore*/
                 mCurrentFile = mFiles;
         }
         send_agent_resume();
@@ -204,12 +208,12 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
                 // The getopenfilename api doesn't tell us if we got more than
                 // one file, so we have to test manually by checking string
                 // lengths.
-                if( wcslen(mOFN.lpstrFile) > mOFN.nFileOffset )
+                if( wcslen(mOFN.lpstrFile) > mOFN.nFileOffset ) /*Flawfinder: ignore*/
                 {
                         mMultiFile = FALSE;
                         mCurrentFile = mFiles;
                         LLString tstr = utf16str_to_utf8str(llutf16string(mFilesW));
-                        memcpy(mFiles, tstr.c_str(), tstr.size()+1);
+                        memcpy(mFiles, tstr.c_str(), tstr.size()+1); /*Flawfinder: ignore*/
                 }
                 else
                 {
@@ -252,7 +256,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         if (filename)
         {
                 llutf16string tstring = utf8str_to_utf16str(filename);
-                wcsncpy(mFilesW, tstring.c_str(), FILENAME_BUFFER_SIZE);        }
+                wcsncpy(mFilesW, tstring.c_str(), FILENAME_BUFFER_SIZE);        }       /*Flawfinder: ignore*/
         else
         {
                 mFilesW[0] = '\0';
@@ -272,7 +276,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_WAV:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.wav", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.wav", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"wav";
                         L"WAV Sounds (*.wav)\0*.wav\0" \
@@ -281,7 +285,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_TGA:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.tga", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.tga", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"tga";
                 mOFN.lpstrFilter =
@@ -291,7 +295,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_BMP:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.bmp", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.bmp", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"bmp";
                 mOFN.lpstrFilter =
@@ -301,7 +305,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_AVI:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.avi", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.avi", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"avi";
                 mOFN.lpstrFilter =
@@ -311,7 +315,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_ANIM:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.xaf", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.xaf", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"xaf";
                 mOFN.lpstrFilter =
@@ -322,7 +326,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_GEOMETRY:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.slg", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.slg", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"slg";
                 mOFN.lpstrFilter =
@@ -333,7 +337,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_XML:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.xml", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.xml", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
 
                 mOFN.lpstrDefExt = L"xml";
@@ -344,7 +348,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_COLLADA:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.collada", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.collada", FILENAME_BUFFER_SIZE);    /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"collada";
                 mOFN.lpstrFilter =
@@ -354,12 +358,22 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_RAW:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.raw", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.raw", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"raw";
                 mOFN.lpstrFilter =      RAW_FILTER \
                                                         L"\0";
                 break;
+        case FFSAVE_J2C:
+                if (!filename)
+                {
+                        wcsncpy( mFilesW,L"untitled.j2c", FILENAME_BUFFER_SIZE);
+                }
+                mOFN.lpstrDefExt = L"j2c";
+                mOFN.lpstrFilter =
+                        L"Compressed Images (*.j2c)\0*.j2c\0" \
+                        L"\0";
+                break;
         default:
                 return FALSE;
         }
@@ -376,7 +390,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
                 if (success)
                 {
                         LLString tstr = utf16str_to_utf8str(llutf16string(mFilesW));
-                        memcpy(mFiles, tstr.c_str(), tstr.size()+1);
+                        memcpy(mFiles, tstr.c_str(), tstr.size()+1);  /*Flawfinder: ignore*/
                         mCurrentFile = mFiles;
                 }
                 gKeyboard->resetKeys();
@@ -402,7 +416,7 @@ const char* LLFilePicker::getNextFile()
 {
         if(mMultiFile)
         {
-                mCurrentFile += strlen(mCurrentFile) + 1;
+                mCurrentFile += strlen(mCurrentFile) + 1;       /*Flawfinder: ignore*/
                 if( '\0' != mCurrentFile[0] )
                 {
                         buildFilename();
@@ -435,11 +449,11 @@ void LLFilePicker::reset()
 
 void LLFilePicker::buildFilename( void )
 {
-        strncpy( mFilename, mFiles, LL_MAX_PATH );
-        S32 len = strlen( mFilename );
+        strncpy( mFilename, mFiles, LL_MAX_PATH );      /*Flawfinder: ignore*/
+        S32 len = strlen( mFilename );  /*Flawfinder: ignore*/
 
-        strcat(mFilename,gDirUtilp->getDirDelimiter().c_str());
-        len += strlen(gDirUtilp->getDirDelimiter().c_str());
+        strncat(mFilename,gDirUtilp->getDirDelimiter().c_str(), sizeof(mFilename)-len+1);               /*Flawfinder: ignore*/
+        len += strlen(gDirUtilp->getDirDelimiter().c_str());    /*Flawfinder: ignore*/
 
 //      mFilename[len++] = '\\';
         LLString::copy( mFilename + len, mCurrentFile, LL_MAX_PATH - len );
@@ -601,7 +615,7 @@ OSStatus	LLFilePicker::doNavChooseDialog(ELoadFilter filter)
                         AEKeyword       theAEKeyword;
                         DescType        typeCode;
                         Size            actualSize = 0;
-                        char            path[MAX_PATH];
+                        char            path[MAX_PATH]; /*Flawfinder: ignore*/
                         
                         memset(&fsRef, 0, sizeof(fsRef));
                         error = AEGetNthPtr(&navReply.selection, index, typeFSRef, &theAEKeyword, &typeCode, &fsRef, sizeof(fsRef), &actualSize);
@@ -675,6 +689,12 @@ OSStatus	LLFilePicker::doNavSaveDialog(ESaveFilter filter, const char* filename)
                         extension = CFSTR(".raw");
                         break;
 
+                case FFSAVE_J2C:
+                        type = '\?\?\?\?';
+                        creator = 'prvw';
+                        extension = CFSTR(".j2c");
+                        break;
+                
                 case FFSAVE_ALL:
                 default:
                         type = '\?\?\?\?';
@@ -750,8 +770,8 @@ OSStatus	LLFilePicker::doNavSaveDialog(ESaveFilter filter, const char* filename)
                         
                         if (error == noErr)
                         {
-                                char    path[PATH_MAX];
-                                char    newFileName[SINGLE_FILENAME_BUFFER_SIZE];
+                                char    path[PATH_MAX];         /*Flawfinder: ignore*/
+                                char    newFileName[SINGLE_FILENAME_BUFFER_SIZE];       /*Flawfinder: ignore*/
                                 
                                 error = FSRefMakePath(&fsRef, (UInt8*)path, PATH_MAX);
                                 if (error == noErr)
@@ -836,7 +856,7 @@ void LLFilePicker::getFilePath(SInt32 index)
 {
         mFiles[0] = 0;
         if (mFileVector.size())
-                strcpy(mFiles, mFileVector[index].c_str());
+                strncpy(mFiles, mFileVector[index].c_str(), sizeof(mFiles));    /*Flawfinder: ignore*/  
 }
 
 void LLFilePicker::getFileName(SInt32 index)
@@ -846,7 +866,7 @@ void LLFilePicker::getFileName(SInt32 index)
         {
                 char    *start = strrchr(mFileVector[index].c_str(), '/');
                 if (start && ((start + 1 - mFileVector[index].c_str()) < (mFileVector[index].size())))
-                        strcpy(mFilename, start + 1);
+                        strncpy(mFilename, start + 1, sizeof(mFilename));               /*Flawfinder: ignore*/
         }
 }
 
@@ -973,8 +993,7 @@ static void store_filenames(GtkWidget *widget, gpointer user_data) {
 
 GtkWindow* LLFilePicker::buildFilePicker(void)
 {
-        gtk_disable_setlocale();
-        if (gtk_init_check(NULL, NULL) &&
+        if (ll_try_gtk_init() &&
             ! gViewerWindow->getWindow()->getFullscreen())
         {
                 GtkWidget *win = NULL;
@@ -986,18 +1005,17 @@ GtkWindow* LLFilePicker::buildFilePicker(void)
                 // Make GTK tell the window manager to associate this
                 // dialog with our non-GTK raw X11 window, which should try
                 // to keep it on top etc.
-                Window *XWindowID_ptr = (Window*) gViewerWindow->
-                        getWindow()->getPlatformWindow();
-                if (XWindowID_ptr && None != *XWindowID_ptr)
+                Window XWindowID = get_SDL_XWindowID();
+                if (None != XWindowID)
                 {
                         gtk_widget_realize(GTK_WIDGET(win)); // so we can get its gdkwin
-                        GdkWindow *gdkwin = gdk_window_foreign_new(*XWindowID_ptr);
+                        GdkWindow *gdkwin = gdk_window_foreign_new(XWindowID);
                         gdk_window_set_transient_for(GTK_WIDGET(win)->window,
                                                      gdkwin);
                 }
                 else
                 {
-                        llwarns << "Hmm, couldn't get xwid from LLWindow." << llendl;
+                        llwarns << "Hmm, couldn't get xwid to use for transient." << llendl;
                 }
 #  endif //LL_X11
 
@@ -1080,6 +1098,10 @@ BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const char* filename )
                         caption += "RAW File (*.raw)";
                         suggest_ext += ".raw";
                         break;
+                case FFSAVE_J2C:
+                        caption += "Compressed Images (*.j2c)";
+                        suggest_ext += ".j2c";
+                        break;
                 default:;
                         break;
                 }