[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xselect.c
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/xselect.c |
Date: |
Tue, 09 Nov 2004 08:33:46 -0500 |
Index: emacs/src/xselect.c
diff -c emacs/src/xselect.c:1.142 emacs/src/xselect.c:1.143
*** emacs/src/xselect.c:1.142 Fri Nov 5 11:30:31 2004
--- emacs/src/xselect.c Tue Nov 9 13:26:58 2004
***************
*** 24,29 ****
--- 24,37 ----
#include <config.h>
#include <stdio.h> /* termhooks.h needs this */
+
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+
#include "lisp.h"
#include "xterm.h" /* for all of the X includes */
#include "dispextern.h" /* frame.h seems to want this */
***************
*** 174,180 ****
! /* Define a queue to save up SelectionRequest events for later handling. */
struct selection_event_queue
{
--- 182,189 ----
! /* Define a queue to save up SELECTION_REQUEST_EVENT events for later
! handling. */
struct selection_event_queue
{
***************
*** 184,194 ****
static struct selection_event_queue *selection_queue;
! /* Nonzero means queue up certain events--don't process them yet. */
static int x_queue_selection_requests;
! /* Queue up an X event *EVENT, to be processed later. */
static void
x_queue_event (event)
--- 193,203 ----
static struct selection_event_queue *selection_queue;
! /* Nonzero means queue up SELECTION_REQUEST_EVENT events. */
static int x_queue_selection_requests;
! /* Queue up an SELECTION_REQUEST_EVENT *EVENT, to be processed later. */
static void
x_queue_event (event)
***************
*** 196,207 ****
{
struct selection_event_queue *queue_tmp;
! /* Don't queue repeated requests */
for (queue_tmp = selection_queue; queue_tmp; queue_tmp = queue_tmp->next)
{
if (!bcmp (&queue_tmp->event, event, sizeof (*event)))
{
! TRACE1 ("IGNORE DUP SELECTION EVENT %08x", (unsigned long)queue_tmp);
return;
}
}
--- 205,218 ----
{
struct selection_event_queue *queue_tmp;
! /* Don't queue repeated requests.
! This only happens for large requests which uses the incremental
protocol. */
for (queue_tmp = selection_queue; queue_tmp; queue_tmp = queue_tmp->next)
{
if (!bcmp (&queue_tmp->event, event, sizeof (*event)))
{
! TRACE1 ("DECLINE DUP SELECTION EVENT %08lx", (unsigned
long)queue_tmp);
! x_decline_selection_request (event);
return;
}
}
***************
*** 211,224 ****
if (queue_tmp != NULL)
{
! TRACE1 ("QUEUE SELECTION EVENT %08x", (unsigned long)queue_tmp);
queue_tmp->event = *event;
queue_tmp->next = selection_queue;
selection_queue = queue_tmp;
}
}
! /* Start queuing SelectionRequest events. */
static void
x_start_queuing_selection_requests ()
--- 222,235 ----
if (queue_tmp != NULL)
{
! TRACE1 ("QUEUE SELECTION EVENT %08lx", (unsigned long)queue_tmp);
queue_tmp->event = *event;
queue_tmp->next = selection_queue;
selection_queue = queue_tmp;
}
}
! /* Start queuing SELECTION_REQUEST_EVENT events. */
static void
x_start_queuing_selection_requests ()
***************
*** 230,236 ****
TRACE1 ("x_start_queuing_selection_requests %d",
x_queue_selection_requests);
}
! /* Stop queuing SelectionRequest events. */
static void
x_stop_queuing_selection_requests ()
--- 241,247 ----
TRACE1 ("x_start_queuing_selection_requests %d",
x_queue_selection_requests);
}
! /* Stop queuing SELECTION_REQUEST_EVENT events. */
static void
x_stop_queuing_selection_requests ()
***************
*** 244,250 ****
while (selection_queue != NULL)
{
struct selection_event_queue *queue_tmp = selection_queue;
! TRACE1 ("RESTORE SELECTION EVENT %08x", (unsigned long)queue_tmp);
kbd_buffer_unget_event (&queue_tmp->event);
selection_queue = queue_tmp->next;
xfree ((char *)queue_tmp);
--- 255,261 ----
while (selection_queue != NULL)
{
struct selection_event_queue *queue_tmp = selection_queue;
! TRACE1 ("RESTORE SELECTION EVENT %08lx", (unsigned long)queue_tmp);
kbd_buffer_unget_event (&queue_tmp->event);
selection_queue = queue_tmp->next;
xfree ((char *)queue_tmp);
***************
*** 869,875 ****
struct x_display_info *dpyinfo
= x_display_info_for_display (SELECTION_EVENT_DISPLAY (event));
! TRACE0 ("x_handle_selection_request");
local_selection_data = Qnil;
target_symbol = Qnil;
--- 880,888 ----
struct x_display_info *dpyinfo
= x_display_info_for_display (SELECTION_EVENT_DISPLAY (event));
! TRACE2 ("x_handle_selection_request, from=0x%08lx time=%lu",
! (unsigned long) SELECTION_EVENT_REQUESTOR (event),
! (unsigned long) SELECTION_EVENT_TIME (event));
local_selection_data = Qnil;
target_symbol = Qnil;