|
@@ -2461,6 +2461,7 @@ laWindow *laDesignWindow(int X, int Y, int W, int H){
|
|
return n;
|
|
return n;
|
|
}
|
|
}
|
|
void laSetWindowCursor(int id){
|
|
void laSetWindowCursor(int id){
|
|
|
|
+ MAIN.CurrentCursor = id;
|
|
#ifdef __linux__
|
|
#ifdef __linux__
|
|
Cursor c = XcursorLibraryLoadCursor(MAIN.dpy, la_ConvertCursorID(id));
|
|
Cursor c = XcursorLibraryLoadCursor(MAIN.dpy, la_ConvertCursorID(id));
|
|
XDefineCursor(MAIN.dpy, MAIN.CurrentWindow->win, c);
|
|
XDefineCursor(MAIN.dpy, MAIN.CurrentWindow->win, c);
|
|
@@ -6925,6 +6926,9 @@ LRESULT CALLBACK LA_WindowProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lp
|
|
case WM_MOVE: /* And size */
|
|
case WM_MOVE: /* And size */
|
|
la_CommandResizeWindow(hwnd, 0, 0, LOWORD(lparam), HIWORD(lparam));
|
|
la_CommandResizeWindow(hwnd, 0, 0, LOWORD(lparam), HIWORD(lparam));
|
|
break;
|
|
break;
|
|
|
|
+ case WM_SETCURSOR:
|
|
|
|
+ if(MAIN.CurrentCursor) return 1;
|
|
|
|
+ break;
|
|
case WM_POINTERUPDATE:
|
|
case WM_POINTERUPDATE:
|
|
if (MAIN.InkOrWinTab) { break;/* Use WinTab. */ }
|
|
if (MAIN.InkOrWinTab) { break;/* Use WinTab. */ }
|
|
pointerId = GET_POINTERID_WPARAM(wparam);
|
|
pointerId = GET_POINTERID_WPARAM(wparam);
|
|
@@ -7326,6 +7330,7 @@ void laMainLoop(){
|
|
|
|
|
|
if(!laFinalize()) return;
|
|
if(!laFinalize()) return;
|
|
|
|
|
|
|
|
+ laSetWindowCursor(LA_ARROW);
|
|
MAIN.DelayTriggered=1;
|
|
MAIN.DelayTriggered=1;
|
|
|
|
|
|
while (1){
|
|
while (1){
|