ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Get rid of the clipboard sequence number update hack. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-09-23 14:16:56 +09:00
parent adf96003a5
commit 99408d7859
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/clipboard.c
View File

@ -46,7 +46,6 @@ struct clipboard
user_handle_t viewer; /* first window in clipboard viewer list */ user_handle_t viewer; /* first window in clipboard viewer list */
unsigned int seqno; /* clipboard change sequence number */ unsigned int seqno; /* clipboard change sequence number */
unsigned int open_seqno; /* sequence number at open time */ unsigned int open_seqno; /* sequence number at open time */
timeout_t seqno_timestamp; /* time stamp of last seqno increment */
unsigned int listen_size; /* size of listeners array */ unsigned int listen_size; /* size of listeners array */
unsigned int listen_count; /* count of listeners */ unsigned int listen_count; /* count of listeners */
user_handle_t *listeners; /* array of listener windows */ user_handle_t *listeners; /* array of listener windows */
@ -78,8 +77,6 @@ static const struct object_ops clipboard_ops =
}; };
#define MINUPDATELAPSE (2 * TICKS_PER_SEC)
/* dump a clipboard object */ /* dump a clipboard object */
static void clipboard_dump( struct object *obj, int verbose ) static void clipboard_dump( struct object *obj, int verbose )
{ {
@ -115,7 +112,6 @@ static struct clipboard *get_process_clipboard(void)
clipboard->owner_win = 0; clipboard->owner_win = 0;
clipboard->viewer = 0; clipboard->viewer = 0;
clipboard->seqno = 0; clipboard->seqno = 0;
clipboard->seqno_timestamp = 0;
clipboard->listen_size = 0; clipboard->listen_size = 0;
clipboard->listen_count = 0; clipboard->listen_count = 0;
clipboard->listeners = NULL; clipboard->listeners = NULL;
@ -244,17 +240,6 @@ static int release_clipboard_owner( struct clipboard *clipboard, user_handle_t w
} }
static int get_seqno( struct clipboard *clipboard )
{
if (!clipboard->owner_thread && (current_time - clipboard->seqno_timestamp > MINUPDATELAPSE))
{
clipboard->seqno_timestamp = current_time;
clipboard->seqno++;
}
return clipboard->seqno;
}
/* open the clipboard */ /* open the clipboard */
DECL_HANDLER(open_clipboard) DECL_HANDLER(open_clipboard)
{ {
@ -314,7 +299,7 @@ DECL_HANDLER(set_clipboard_info)
if (req->flags & SET_CB_SEQNO) clipboard->seqno++; if (req->flags & SET_CB_SEQNO) clipboard->seqno++;
reply->seqno = get_seqno( clipboard ); reply->seqno = clipboard->seqno;
if (clipboard->open_thread) reply->flags |= CB_OPEN_ANY; if (clipboard->open_thread) reply->flags |= CB_OPEN_ANY;
if (clipboard->open_thread == current) reply->flags |= CB_OPEN; if (clipboard->open_thread == current) reply->flags |= CB_OPEN;
@ -371,7 +356,7 @@ DECL_HANDLER(get_clipboard_info)
reply->window = clipboard->open_win; reply->window = clipboard->open_win;
reply->owner = clipboard->owner_win; reply->owner = clipboard->owner_win;
reply->viewer = clipboard->viewer; reply->viewer = clipboard->viewer;
reply->seqno = get_seqno( clipboard ); reply->seqno = clipboard->seqno;
} }