Commit fad1b5f0 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Clipboard.{c,h}: cleanup prototypes

parent 34109b85
...@@ -232,19 +232,17 @@ XFixesAgentInfoRec nxagentXFixesInfo = { -1, -1, -1, 0 }; ...@@ -232,19 +232,17 @@ XFixesAgentInfoRec nxagentXFixesInfo = { -1, -1, -1, 0 };
extern Display *nxagentDisplay; extern Display *nxagentDisplay;
Bool nxagentValidServerTargets(XlibAtom target); static Bool nxagentValidServerTargets(XlibAtom target);
static void endTransfer(Bool success); static void endTransfer(Bool success);
#define SELECTION_SUCCESS True #define SELECTION_SUCCESS True
#define SELECTION_FAULT False #define SELECTION_FAULT False
void nxagentTransferSelection(int resource); static void nxagentTransferSelection(int resource);
void nxagentCollectPropertyEvent(int resource);
#if 0 #if 0
void nxagentResetSelectionOwner(void); void nxagentResetSelectionOwner(void);
#endif #endif
WindowPtr nxagentGetClipboardWindow(Atom property); static void nxagentNotifyConvertFailure(ClientPtr client, Window requestor,
void nxagentNotifyConvertFailure(ClientPtr client, Window requestor, Atom selection, Atom target, Time time);
Atom selection, Atom target, Time time); static void nxagentSetSelectionOwner(Selection *pSelection);
int nxagentSendNotify(xEvent *event);
void nxagentPrintClipboardStat(char *); void nxagentPrintClipboardStat(char *);
...@@ -475,7 +473,7 @@ int SendSelectionNotifyEventToClient(ClientPtr client, ...@@ -475,7 +473,7 @@ int SendSelectionNotifyEventToClient(ClientPtr client,
* server, like .e.g XA_STRING or UTF8_STRING. Other, non content type * server, like .e.g XA_STRING or UTF8_STRING. Other, non content type
* targets like "TARGETS" or "TIMESTAMP" will return false. * targets like "TARGETS" or "TIMESTAMP" will return false.
*/ */
Bool nxagentValidServerTargets(XlibAtom target) static Bool nxagentValidServerTargets(XlibAtom target)
{ {
if (target == XA_STRING) if (target == XA_STRING)
{ {
...@@ -1012,7 +1010,7 @@ static void endTransfer(Bool success) ...@@ -1012,7 +1010,7 @@ static void endTransfer(Bool success)
SetClientSelectionStage(None); SetClientSelectionStage(None);
} }
void nxagentTransferSelection(int resource) static void nxagentTransferSelection(int resource)
{ {
if (lastClientClientPtr -> index != resource) if (lastClientClientPtr -> index != resource)
{ {
...@@ -1603,7 +1601,7 @@ void nxagentSetSelectionCallback(CallbackListPtr *callbacks, void *data, ...@@ -1603,7 +1601,7 @@ void nxagentSetSelectionCallback(CallbackListPtr *callbacks, void *data,
* This is called from the nxagentSetSelectionCallback, so it is using * This is called from the nxagentSetSelectionCallback, so it is using
* internal Atoms * internal Atoms
*/ */
void nxagentSetSelectionOwner(Selection *pSelection) static void nxagentSetSelectionOwner(Selection *pSelection)
{ {
if (!agentClipboardInitialized) if (!agentClipboardInitialized)
{ {
...@@ -1687,8 +1685,8 @@ FIXME ...@@ -1687,8 +1685,8 @@ FIXME
*/ */
} }
void nxagentNotifyConvertFailure(ClientPtr client, Window requestor, static void nxagentNotifyConvertFailure(ClientPtr client, Window requestor,
Atom selection, Atom target, Time time) Atom selection, Atom target, Time time)
{ {
/* /*
* Check if the client is still valid. * Check if the client is still valid.
......
...@@ -54,7 +54,6 @@ extern Bool nxagentInitClipboard(WindowPtr pWindow); ...@@ -54,7 +54,6 @@ extern Bool nxagentInitClipboard(WindowPtr pWindow);
extern void nxagentClearClipboard(ClientPtr pClient, WindowPtr pWindow); extern void nxagentClearClipboard(ClientPtr pClient, WindowPtr pWindow);
extern void nxagentSetSelectionOwner(Selection *pSelection);
extern int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection, extern int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
Window requestor, Atom property, Atom target, Time time); Window requestor, Atom property, Atom target, Time time);
...@@ -69,4 +68,14 @@ extern void nxagentHandleSelectionNotifyFromXServer(); ...@@ -69,4 +68,14 @@ extern void nxagentHandleSelectionNotifyFromXServer();
#endif #endif
extern int nxagentFindCurrentSelectionIndex(Atom sel); extern int nxagentFindCurrentSelectionIndex(Atom sel);
/*
* Handle the selection property received in the event loop in
* Events.c.
*/
extern void nxagentCollectPropertyEvent(int resource);
extern WindowPtr nxagentGetClipboardWindow(Atom property);
extern int nxagentSendNotify(xEvent *event);
#endif /* __Clipboard_H__ */ #endif /* __Clipboard_H__ */
...@@ -150,13 +150,6 @@ extern void nxagentUngrabPointerAndKeyboard(XEvent *X); ...@@ -150,13 +150,6 @@ extern void nxagentUngrabPointerAndKeyboard(XEvent *X);
extern void nxagentDeactivatePointerGrab(void); extern void nxagentDeactivatePointerGrab(void);
/* /*
* Handle the selection property received
* in the event loop.
*/
void nxagentCollectPropertyEvent(int resource);
/*
* Synchronize expose events between agent and * Synchronize expose events between agent and
* the real X server. * the real X server.
*/ */
......
...@@ -143,6 +143,7 @@ of the copyright holder. ...@@ -143,6 +143,7 @@ of the copyright holder.
#include "Events.h" #include "Events.h"
#include "Windows.h" #include "Windows.h"
#include "Args.h" #include "Args.h"
#include "Clipboard.h"
extern Display *nxagentDisplay; extern Display *nxagentDisplay;
...@@ -153,11 +154,6 @@ extern void nxagentInitViewportFrame(ScreenPtr, WindowPtr); ...@@ -153,11 +154,6 @@ extern void nxagentInitViewportFrame(ScreenPtr, WindowPtr);
#endif #endif
extern int nxagentShadowInit(ScreenPtr, WindowPtr); extern int nxagentShadowInit(ScreenPtr, WindowPtr);
#ifdef NXAGENT_CLIPBOARD
extern int nxagentSendNotify(xEvent*);
#endif
void void
ActivatePointerGrab(register DeviceIntPtr mouse, register GrabPtr grab, ActivatePointerGrab(register DeviceIntPtr mouse, register GrabPtr grab,
TimeStamp time, Bool autoGrab) TimeStamp time, Bool autoGrab)
......
...@@ -76,6 +76,7 @@ SOFTWARE. ...@@ -76,6 +76,7 @@ SOFTWARE.
#include "Rootless.h" #include "Rootless.h"
#include "Client.h" #include "Client.h"
#include "Windows.h" #include "Windows.h"
#include "Clipboard.h"
extern Atom clientCutProperty; extern Atom clientCutProperty;
...@@ -93,10 +94,6 @@ nxagentWMStateRec; ...@@ -93,10 +94,6 @@ nxagentWMStateRec;
#undef TEST #undef TEST
#undef DEBUG #undef DEBUG
#ifdef NXAGENT_CLIPBOARD
extern WindowPtr nxagentGetClipboardWindow(Atom);
#endif
#ifdef NXAGENT_ARTSD #ifdef NXAGENT_ARTSD
extern Atom mcop_local_atom; extern Atom mcop_local_atom;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment