1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 08:49:37 +00:00

Merge branch 'master' into IIe

This commit is contained in:
Thomas Harte 2018-07-28 10:54:04 -04:00
commit 894998b163
5 changed files with 37 additions and 10 deletions

View File

@ -7,11 +7,13 @@
// //
#include <algorithm> #include <algorithm>
#include <array>
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
#include <iostream> #include <iostream>
#include <memory> #include <memory>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h>
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
@ -281,6 +283,22 @@ std::string final_path_component(const std::string &path) {
return path.substr(final_slash+1, path.size() - final_slash - 1); return path.substr(final_slash+1, path.size() - final_slash - 1);
} }
/*!
Executes @c command and returns its STDOUT.
*/
std::string system_get(const char *command) {
std::unique_ptr<FILE, decltype((pclose))> pipe(popen(command, "r"), pclose);
if(!pipe) return "";
std::string result;
while(!feof(pipe.get())) {
std::array<char, 256> buffer;
if (fgets(buffer.data(), buffer.size(), pipe.get()) != nullptr)
result += buffer.data();
}
return result;
}
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
@ -617,12 +635,21 @@ int main(int argc, char *argv[]) {
memcpy(&pixels[(window_height - 1 - y)*proportional_width*4], swap_buffer.data(), swap_buffer.size()); memcpy(&pixels[(window_height - 1 - y)*proportional_width*4], swap_buffer.data(), swap_buffer.size());
} }
// Pick the directory for images. Try `xdg-user-dir PICTURES` first.
std::string target_directory = system_get("xdg-user-dir PICTURES");
// Make sure there are no newlines.
target_directory.erase(std::remove(target_directory.begin(), target_directory.end(), '\n'), target_directory.end());
target_directory.erase(std::remove(target_directory.begin(), target_directory.end(), '\r'), target_directory.end());
// Fall back on the HOME directory if necessary.
if(target_directory.empty()) target_directory = getenv("HOME");
// Find the first available name of the form ~/clk-screenshot-<number>.bmp. // Find the first available name of the form ~/clk-screenshot-<number>.bmp.
size_t index = 0; size_t index = 0;
const std::string home = getenv("HOME");
std::string target; std::string target;
while(true) { while(true) {
target = home + "/clk-screenshot-" + std::to_string(index) + ".bmp"; target = target_directory + "/clk-screenshot-" + std::to_string(index) + ".bmp";
struct stat file_stats; struct stat file_stats;
if(stat(target.c_str(), &file_stats)) if(stat(target.c_str(), &file_stats))