AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-19 04:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix updater not showing on some linux distributions

Browse Source
This commit is contained in:
UnknownShadow200 2019-02-21 15:51:06 +11:00
parent af49f287e0
commit 31e84040e3
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Launcher.c
View File

@ -605,7 +605,7 @@ static void Launcher_ApplyUpdate(void) {
#else #else
const static String scriptPath = String_FromConst("update.sh"); const static String scriptPath = String_FromConst("update.sh");
const static String scriptName = String_FromConst("xterm"); const static String scriptName = String_FromConst("xterm");
const static String scriptArgs = String_FromConst("./update.sh"); const static String scriptArgs = String_FromConst("-e ./update.sh");
#endif #endif
char strBuffer[1024], exeBuffer[FILENAME_SIZE]; char strBuffer[1024], exeBuffer[FILENAME_SIZE];
String str, exe; String str, exe;

31
src/Window.c
View File

@ -50,7 +50,6 @@ static HINSTANCE win_instance;
static HWND win_handle; static HWND win_handle;
static HDC win_DC; static HDC win_DC;
static int win_state; static int win_state;
static bool invisible_since_creation; /* Set by WindowsMessage.CREATE and consumed by Visible = true (calls BringWindowToFront) */
static int suppress_resize; /* Used in WindowBorder and WindowState in order to avoid rapid, consecutive resize events */ static int suppress_resize; /* Used in WindowBorder and WindowState in order to avoid rapid, consecutive resize events */
static Rect2D prev_bounds; /* Used to restore previous size when leaving fullscreen mode */ static Rect2D prev_bounds; /* Used to restore previous size when leaving fullscreen mode */
@ -221,7 +220,6 @@ static LRESULT CALLBACK Window_Procedure(HWND handle, UINT message, WPARAM wPara
} }
} break; } break;
case WM_CHAR: case WM_CHAR:
if (Convert_TryUnicodeToCP437((Codepoint)wParam, &keyChar)) { if (Convert_TryUnicodeToCP437((Codepoint)wParam, &keyChar)) {
Event_RaiseInt(&KeyEvents.Press, keyChar); Event_RaiseInt(&KeyEvents.Press, keyChar);
@ -243,26 +241,21 @@ static LRESULT CALLBACK Window_Procedure(HWND handle, UINT message, WPARAM wPara
return 0; return 0;
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
Mouse_SetPressed(MOUSE_LEFT, true); Mouse_SetPressed(MOUSE_LEFT, true); break;
break;
case WM_MBUTTONDOWN: case WM_MBUTTONDOWN:
Mouse_SetPressed(MOUSE_MIDDLE, true); Mouse_SetPressed(MOUSE_MIDDLE, true); break;
break;
case WM_RBUTTONDOWN: case WM_RBUTTONDOWN:
Mouse_SetPressed(MOUSE_RIGHT, true); Mouse_SetPressed(MOUSE_RIGHT, true); break;
break;
case WM_XBUTTONDOWN: case WM_XBUTTONDOWN:
Key_SetPressed(HIWORD(wParam) == 1 ? KEY_XBUTTON1 : KEY_XBUTTON2, true); Key_SetPressed(HIWORD(wParam) == 1 ? KEY_XBUTTON1 : KEY_XBUTTON2, true);
break; break;
case WM_LBUTTONUP: case WM_LBUTTONUP:
Mouse_SetPressed(MOUSE_LEFT, false); Mouse_SetPressed(MOUSE_LEFT, false); break;
break;
case WM_MBUTTONUP: case WM_MBUTTONUP:
Mouse_SetPressed(MOUSE_MIDDLE, false); Mouse_SetPressed(MOUSE_MIDDLE, false); break;
break;
case WM_RBUTTONUP: case WM_RBUTTONUP:
Mouse_SetPressed(MOUSE_RIGHT, false); Mouse_SetPressed(MOUSE_RIGHT, false); break;
break;
case WM_XBUTTONUP: case WM_XBUTTONUP:
Key_SetPressed(HIWORD(wParam) == 1 ? KEY_XBUTTON1 : KEY_XBUTTON2, false); Key_SetPressed(HIWORD(wParam) == 1 ? KEY_XBUTTON1 : KEY_XBUTTON2, false);
break; break;
@ -325,10 +318,6 @@ static LRESULT CALLBACK Window_Procedure(HWND handle, UINT message, WPARAM wPara
Key_Clear(); Key_Clear();
break; break;
case WM_CREATE:
invisible_since_creation = true;
break;
case WM_CLOSE: case WM_CLOSE:
Event_RaiseVoid(&WindowEvents.Closing); Event_RaiseVoid(&WindowEvents.Closing);
if (Window_Exists) DestroyWindow(win_handle); if (Window_Exists) DestroyWindow(win_handle);
@ -473,10 +462,8 @@ bool Window_GetVisible(void) { return IsWindowVisible(win_handle); }
void Window_SetVisible(bool visible) { void Window_SetVisible(bool visible) {
if (visible) { if (visible) {
ShowWindow(win_handle, SW_SHOW); ShowWindow(win_handle, SW_SHOW);
if (invisible_since_creation) { BringWindowToTop(win_handle);
BringWindowToTop(win_handle); SetForegroundWindow(win_handle);
SetForegroundWindow(win_handle);
}
} else { } else {
ShowWindow(win_handle, SW_HIDE); ShowWindow(win_handle, SW_HIDE);
} }