mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Revert "Disable xcb_xlib"

Browse Source 
This reverts commit d1ff6e583d.

Otherwise HIME input is broken:
https://github.com/telegramdesktop/tdesktop/issues/26228
This commit is contained in:
John Preston
2023-05-24 18:11:36 +04:00
parent 04a3a50e74
commit f46f655a0e
3 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View File

@@ -50,20 +50,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <unistd.h>
#include <dirent.h>
#include <pwd.h>
#include <dlfcn.h>
#include <iostream>
using namespace Platform;
using Platform::internal::WaylandIntegration;
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
typedef struct _XDisplay Display;
struct XErrorEvent;
typedef int (*XErrorHandler)(Display*, XErrorEvent*);
typedef XErrorHandler (*LPXSETERRORHANDLER)(XErrorHandler);
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
typedef GApplication TDesktopApplication;
typedef GApplicationClass TDesktopApplicationClass;
@@ -840,20 +832,6 @@ void start() {
"except various functionality to not to work.");
}
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
// tdesktop doesn't use xlib by itself,
// but some libraries it depends on may do
const auto XSetErrorHandler = reinterpret_cast<LPXSETERRORHANDLER>(
dlsym(RTLD_DEFAULT, "XSetErrorHandler"));
// Reset errors if any
(void) dlerror();
if (XSetErrorHandler) {
XSetErrorHandler([](Display *dpy, XErrorEvent *err) { return 0; });
}
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
InstallLauncher();
LaunchGApplication();
}