mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 21:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added caching of desktop file path

Browse Source
This commit is contained in:
GamesTrap 2023-04-10 14:16:08 +02:00
parent dacb814e8b
commit 1824da004f
No known key found for this signature in database
GPG Key ID: 31DFD452434ECDA3
2 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/posix_dbus.c
View File

@ -125,10 +125,53 @@ void _glfwInitDBusPOSIX(void)
_glfw.dbus.connection = NULL; _glfw.dbus.connection = NULL;
} }
} }
_glfwCacheDesktopFilePathPOSIX();
}
void _glfwCacheDesktopFilePathPOSIX(void)
{
//Cache path of .desktop file
//Get name of the running executable
char exeName[PATH_MAX];
memset(exeName, 0, sizeof(char) * PATH_MAX);
if(readlink("/proc/self/exe", exeName, PATH_MAX) == -1)
{
_glfwInputError(GLFW_PLATFORM_ERROR, "Failed to get name of the running executable");
return;
}
char* exeNameEnd = strchr(exeName, '\0');
char* lastFound = strrchr(exeName, '/');
if(!lastFound || !exeNameEnd)
{
_glfwInputError(GLFW_PLATFORM_ERROR, "Failed to get name of the running executable");
return;
}
unsigned int exeNameLength = (exeNameEnd - lastFound) - 1;
//Create our final desktop file uri
unsigned int desktopFileLength = strlen("application://") + exeNameLength + strlen(".desktop") + 1;
_glfw.dbus.desktopFilePath = _glfw_calloc(desktopFileLength, sizeof(char));
if(!_glfw.dbus.desktopFilePath)
{
_glfwInputError(GLFW_OUT_OF_MEMORY, "Failed to allocate memory for .desktop file path");
return;
}
else
{
memset(_glfw.dbus.desktopFilePath, 0, sizeof(char) * desktopFileLength);
strcpy(_glfw.dbus.desktopFilePath, "application://");
memcpy(_glfw.dbus.desktopFilePath + strlen("application://"), lastFound + 1, exeNameLength);
strcpy(_glfw.dbus.desktopFilePath + strlen("application://") + (exeNameLength), ".desktop");
_glfw.dbus.desktopFilePath[desktopFileLength - 1] = '\0';
}
} }
void _glfwTerminateDBusPOSIX(void) void _glfwTerminateDBusPOSIX(void)
{ {
if(_glfw.dbus.desktopFilePath)
_glfw_free(_glfw.dbus.desktopFilePath);
if (_glfw.dbus.connection) if (_glfw.dbus.connection)
{ {
dbus_connection_unref(_glfw.dbus.connection); dbus_connection_unref(_glfw.dbus.connection);
@ -144,11 +187,8 @@ void _glfwTerminateDBusPOSIX(void)
void _glfwUpdateTaskbarProgressDBusPOSIX(dbus_bool_t progressVisible, double progressValue) void _glfwUpdateTaskbarProgressDBusPOSIX(dbus_bool_t progressVisible, double progressValue)
{ {
if(!_glfw.dbus.handle || !_glfw.dbus.connection) if(!_glfw.dbus.handle || !_glfw.dbus.connection || !_glfw.dbus.desktopFilePath)
{
_glfwInputError(GLFW_FEATURE_UNAVAILABLE, "POSIX: No DBus connection open to set taskbar progress");
return; return;
}
//Signal signature: //Signal signature:
//signal com.canonical.Unity.LauncherEntry.Update (in s app_uri, in a{sv} properties) //signal com.canonical.Unity.LauncherEntry.Update (in s app_uri, in a{sv} properties)

3
src/posix_dbus.h
View File

@ -124,8 +124,11 @@ typedef struct _GLFWDBusPOSIX
DBusConnection* connection; DBusConnection* connection;
struct DBusError error; struct DBusError error;
char* desktopFilePath;
} _GLFWDBusPOSIX; } _GLFWDBusPOSIX;
void _glfwInitDBusPOSIX(void); void _glfwInitDBusPOSIX(void);
void _glfwCacheDesktopFilePathPOSIX(void);
void _glfwTerminateDBusPOSIX(void); void _glfwTerminateDBusPOSIX(void);
void _glfwUpdateTaskbarProgressDBusPOSIX(dbus_bool_t progressVisible, double progressValue); void _glfwUpdateTaskbarProgressDBusPOSIX(dbus_bool_t progressVisible, double progressValue);