Merge branch 'master' into TimePath/issue-1170

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / screenshotlist.c

diff --git a/qcsrc/menu/xonotic/screenshotlist.c b/qcsrc/menu/xonotic/screenshotlist.c
index 8419eb709ca4c082579aaa3931a38b9cd861c448..dd8b61ed3f97fc942a456ef2799939c1f9e17f2a 100644 (file)
--- a/qcsrc/menu/xonotic/screenshotlist.c
+++ b/qcsrc/menu/xonotic/screenshotlist.c
@@ -62,11 +62,14 @@ void XonoticScreenshotList_configureXonoticScreenshotList(entity me)
        me.getScreenshots(me);
 }
 
-string XonoticScreenshotList_screenshotName(entity me, float i )
+string XonoticScreenshotList_screenshotName(entity me, float i)
 {
        string s;
        s = bufstr_get(me.listScreenshot, i);
-       s = substring(s, 12, strlen(s) - 12 - 4);  // screenshots/, .<ext>
+
+       if(substring(s, 0, 1) == "/")
+               s = substring(s, 1, strlen(s) - 1);  // remove the first forward slash
+
        return s;
 }
 
@@ -89,7 +92,18 @@ void getScreenshots_for_ext(entity me, string ext, float subdir)
        {
                n = search_getsize(list);
                for(i = 0; i < n; ++i)
-                       bufstr_add(me.listScreenshot, search_getfilename(list, i), TRUE);
+               {
+                       s = search_getfilename(list, i); // get initial full file name
+                       s = substring(s, 12, (strlen(s) - 12 - 4)); // remove "screenshots/" prefix and ".<ext>" suffix
+                       s = strdecolorize(s); // remove any pre-existing colors
+                       if(subdir)
+                       {
+                               s = strreplace("/", "^7/", s); // clear colors at the forward slash
+                               s = strcat("/", rgb_to_hexcolor(SKINCOLOR_SCREENSHOTLIST_SUBDIR), s); // add a forward slash for sorting, then color
+                               bufstr_add(me.listScreenshot, s, TRUE);
+                       }
+                       else { bufstr_add(me.listScreenshot, s, TRUE); }
+               }
                search_end(list);
        }
 
@@ -111,12 +125,14 @@ void XonoticScreenshotList_getScreenshots(entity me)
        getScreenshots_for_ext(me, ".tga", TRUE);
        getScreenshots_for_ext(me, ".png", TRUE);
        me.nItems = buf_getsize(me.listScreenshot);
-       buf_sort(me.listScreenshot, 128, FALSE);
+       if(me.nItems > 0)
+               buf_sort(me.listScreenshot, 128, FALSE);
 }
 
 void XonoticScreenshotList_destroy(entity me)
 {
-       buf_del(me.listScreenshot);
+       if(me.nItems > 0)
+               buf_del(me.listScreenshot);
 }
 
 void XonoticScreenshotList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
@@ -159,7 +175,7 @@ void XonoticScreenshotList_drawListBoxItem(entity me, float i, vector absSize, f
 
        s = me.screenshotName(me,i);
        s = draw_TextShortenToWidth(s, me.columnNameSize, 0, me.realFontSize);
-       draw_Text(me.realUpperMargin * eY + (me.columnNameOrigin + 0.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
+       draw_Text(me.realUpperMargin * eY + (me.columnNameOrigin + 0.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 1);
 }
 
 void XonoticScreenshotList_showNotify(entity me)
@@ -239,12 +255,12 @@ void XonoticScreenshotList_goScreenshot(entity me, float d)
        if(!me.screenshotViewerDialog)
                return;
        me.setSelected(me, me.selectedItem + d);
-       me.screenshotViewerDialog.loadScreenshot(me.screenshotViewerDialog, strcat("/screenshots/", me.screenshotName(me,me.selectedItem)));
+       me.screenshotViewerDialog.loadScreenshot(me.screenshotViewerDialog, strcat("/screenshots/", strdecolorize(me.screenshotName(me,me.selectedItem))));
 }
 
 void XonoticScreenshotList_startScreenshot(entity me)
 {
-       me.screenshotViewerDialog.loadScreenshot(me.screenshotViewerDialog, strcat("/screenshots/", me.screenshotName(me,me.selectedItem)));
+       me.screenshotViewerDialog.loadScreenshot(me.screenshotViewerDialog, strcat("/screenshots/", strdecolorize(me.screenshotName(me,me.selectedItem))));
        // pop up screenshot
        DialogOpenButton_Click_withCoords(NULL, me.screenshotViewerDialog, me.origin + eX * (me.columnNameOrigin * me.size_x) + eY * ((me.itemHeight * me.selectedItem - me.scrollPos) * me.size_y), eY * me.itemAbsSize_y + eX * (me.itemAbsSize_x * me.columnNameSize));
 }
@@ -256,7 +272,7 @@ void XonoticScreenshotList_previewScreenshot(entity me)
        if (me.nItems <= 0)
                me.screenshotBrowserDialog.loadPreviewScreenshot(me.screenshotBrowserDialog, "");
        else
-               me.screenshotBrowserDialog.loadPreviewScreenshot(me.screenshotBrowserDialog, strcat("/screenshots/", me.screenshotName(me,me.selectedItem)));
+               me.screenshotBrowserDialog.loadPreviewScreenshot(me.screenshotBrowserDialog, strcat("/screenshots/", strdecolorize(me.screenshotName(me,me.selectedItem))));
 }
 
 void StartScreenshot_Click(entity btn, entity me)
@@ -280,7 +296,7 @@ void XonoticScreenshotList_clickListBoxItem(entity me, float i, vector where)
 
 float XonoticScreenshotList_keyDown(entity me, float scan, float ascii, float shift)
 {
-       if(scan == K_ENTER || scan == K_KP_ENTER) {
+       if(scan == K_ENTER || scan == K_KP_ENTER || scan == K_MOUSE2 || scan == K_SPACE) {
                me.startScreenshot(me);
                return 1;
        }