system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 19:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed MSG_WineStartTicks (does not work for multiple address spaces

Browse source 
anyway).
This commit is contained in:
Alexandre Julliard 2000-06-03 20:46:53 +00:00
parent 036de6e5cc
commit eac0e1837c
5 changed files with 9 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/message.h
View file

@ -11,8 +11,6 @@
struct tagMSG;
extern DWORD MSG_WineStartTicks; /* Ticks at Wine startup */
/* message.c */
extern BOOL MSG_InternalGetMessage( int type, struct tagMSG *msg, HWND hwnd,
HWND hwndOwner, WPARAM code,

4
misc/main.c
View file

@ -646,8 +646,6 @@ void MAIN_WineInit(void)
setlocale(LC_CTYPE,"");
gettimeofday( &tv, NULL);
MSG_WineStartTicks = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
atexit(called_at_exit);
}
@ -700,5 +698,5 @@ DWORD WINAPI GetTickCount(void)
{
struct timeval t;
gettimeofday( &t, NULL );
return ((t.tv_sec * 1000) + (t.tv_usec / 1000)) - MSG_WineStartTicks;
return (t.tv_sec * 1000) + (t.tv_usec / 1000);
}

2
windows/message.c
View file

@ -43,8 +43,6 @@ typedef enum { SYSQ_MSG_ABANDON, SYSQ_MSG_SKIP,
extern HQUEUE16 hCursorQueue; /* queue.c */
DWORD MSG_WineStartTicks; /* Ticks at Wine startup */
static UINT doubleClickSpeed = 452;
/***********************************************************************

28
windows/x11drv/event.c
View file

@ -697,14 +697,12 @@ static void EVENT_MotionNotify( HWND hWnd, XMotionEvent *event )
MOUSE_SendEvent( MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE,
xOffset + event->x, yOffset + event->y,
X11DRV_EVENT_XStateToKeyState( event->state ),
event->time - MSG_WineStartTicks,
hWnd);
event->time, hWnd);
} else {
MOUSE_SendEvent( MOUSEEVENTF_MOVE,
event->x_root, event->y_root,
X11DRV_EVENT_XStateToKeyState( event->state ),
event->time - MSG_WineStartTicks,
hWnd);
event->time, hWnd);
}
}
@ -758,8 +756,7 @@ static void EVENT_ButtonPress( HWND hWnd, XButtonEvent *event )
MOUSE_SendEvent( statusCodes[buttonNum],
xOffset + event->x, yOffset + event->y,
MAKEWPARAM(keystate,wData),
event->time - MSG_WineStartTicks,
hWnd);
event->time, hWnd);
}
@ -806,9 +803,7 @@ static void EVENT_ButtonRelease( HWND hWnd, XButtonEvent *event )
MOUSE_SendEvent( statusCodes[buttonNum],
xOffset + event->x, yOffset + event->y,
keystate,
event->time - MSG_WineStartTicks,
hWnd);
keystate, event->time, hWnd);
}
@ -1927,8 +1922,7 @@ static void EVENT_DGAMotionEvent( XDGAMotionEvent *event )
MOUSE_SendEvent( MOUSEEVENTF_MOVE,
event->dx, event->dy,
X11DRV_EVENT_XStateToKeyState( event->state ),
event->time - MSG_WineStartTicks,
DGAhwnd );
event->time, DGAhwnd );
}
static void EVENT_DGAButtonPressEvent( XDGAButtonEvent *event )
@ -1956,11 +1950,7 @@ static void EVENT_DGAButtonPressEvent( XDGAButtonEvent *event )
break;
}
MOUSE_SendEvent( statusCodes[buttonNum],
0, 0,
keystate,
event->time - MSG_WineStartTicks,
DGAhwnd );
MOUSE_SendEvent( statusCodes[buttonNum], 0, 0, keystate, event->time, DGAhwnd );
}
static void EVENT_DGAButtonReleaseEvent( XDGAButtonEvent *event )
@ -1988,11 +1978,7 @@ static void EVENT_DGAButtonReleaseEvent( XDGAButtonEvent *event )
break;
}
MOUSE_SendEvent( statusCodes[buttonNum],
0, 0,
keystate,
event->time - MSG_WineStartTicks,
DGAhwnd );
MOUSE_SendEvent( statusCodes[buttonNum], 0, 0, keystate, event->time, DGAhwnd );
}
#endif

2
windows/x11drv/keyboard.c
View file

@ -596,7 +596,7 @@ void X11DRV_KEYBOARD_HandleEvent( WND *pWnd, XKeyEvent *event )
INT event_x = (pWnd? pWnd->rectWindow.left : 0) + event->x;
INT event_y = (pWnd? pWnd->rectWindow.top : 0) + event->y;
DWORD event_time = event->time - MSG_WineStartTicks;
DWORD event_time = event->time;
/* this allows support for dead keys */
if ((event->keycode >> 8) == 0x10)