just a bit of juggling headers around -- we're preparing
to call our Xquartz-specific event handlers directly as mieqHandlers
This commit is contained in:
parent
1e0ec02202
commit
4aedba5aa7
|
@ -887,7 +887,7 @@ void AbortDDX( void )
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void
|
void
|
||||||
xf86SetRootClip (ScreenPtr pScreen, BOOL enable)
|
xf86SetRootClip (ScreenPtr pScreen, int enable)
|
||||||
{
|
{
|
||||||
WindowPtr pWin = WindowTable[pScreen->myNum];
|
WindowPtr pWin = WindowTable[pScreen->myNum];
|
||||||
WindowPtr pChild;
|
WindowPtr pChild;
|
||||||
|
|
|
@ -54,7 +54,7 @@ typedef struct {
|
||||||
void DarwinPrintBanner(void);
|
void DarwinPrintBanner(void);
|
||||||
int DarwinParseModifierList(const char *constmodifiers);
|
int DarwinParseModifierList(const char *constmodifiers);
|
||||||
void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);
|
void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);
|
||||||
void xf86SetRootClip (ScreenPtr pScreen, BOOL enable);
|
void xf86SetRootClip (ScreenPtr pScreen, int enable);
|
||||||
|
|
||||||
#define SCREEN_PRIV(pScreen) \
|
#define SCREEN_PRIV(pScreen) \
|
||||||
((DarwinFramebufferPtr)pScreen->devPrivates[darwinScreenIndex].ptr)
|
((DarwinFramebufferPtr)pScreen->devPrivates[darwinScreenIndex].ptr)
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "quartzCommon.h"
|
#include "quartzCommon.h"
|
||||||
|
#include "inputstr.h"
|
||||||
#include "quartz.h"
|
#include "quartz.h"
|
||||||
#include "darwin.h"
|
#include "darwin.h"
|
||||||
#include "darwinEvents.h"
|
#include "darwinEvents.h"
|
||||||
|
@ -497,6 +498,7 @@ void QuartzProcessEvent(xEvent *xe) {
|
||||||
GiveUp(0);
|
GiveUp(0);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
#if 0
|
||||||
case kXquartzReadPasteboard:
|
case kXquartzReadPasteboard:
|
||||||
QuartzReadPasteboard();
|
QuartzReadPasteboard();
|
||||||
break;
|
break;
|
||||||
|
@ -504,6 +506,7 @@ void QuartzProcessEvent(xEvent *xe) {
|
||||||
case kXquartzWritePasteboard:
|
case kXquartzWritePasteboard:
|
||||||
QuartzWritePasteboard();
|
QuartzWritePasteboard();
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
|
|
||||||
case kXquartzBringAllToFront:
|
case kXquartzBringAllToFront:
|
||||||
DEBUG_LOG("kXquartzBringAllToFront\n");
|
DEBUG_LOG("kXquartzBringAllToFront\n");
|
||||||
|
|
|
@ -37,13 +37,14 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "quartzCommon.h"
|
#include "quartzCommon.h"
|
||||||
|
#include "inputstr.h"
|
||||||
#include "quartzPasteboard.h"
|
#include "quartzPasteboard.h"
|
||||||
|
|
||||||
#define BOOL xBOOL
|
#define BOOL xBOOL
|
||||||
#include "darwin.h"
|
#include "darwin.h"
|
||||||
#undef BOOL
|
|
||||||
|
|
||||||
#include <Cocoa/Cocoa.h>
|
#include <Cocoa/Cocoa.h>
|
||||||
|
#undef BOOL
|
||||||
|
|
||||||
#include "pseudoramiX.h"
|
#include "pseudoramiX.h"
|
||||||
|
|
||||||
|
|
|
@ -34,6 +34,8 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "misc.h"
|
||||||
|
#include "inputstr.h"
|
||||||
#include "quartzPasteboard.h"
|
#include "quartzPasteboard.h"
|
||||||
|
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
|
@ -81,8 +83,8 @@ static char * QuartzReadCutBuffer(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write X cut buffer to Mac OS X pasteboard
|
// Write X cut buffer to Mac OS X pasteboard
|
||||||
// Called by ProcessInputEvents() in response to request from X server thread.
|
// Called by mieqProcessInputEvents() in response to request from X server thread.
|
||||||
void QuartzWritePasteboard(void)
|
void QuartzWritePasteboard(int screenNum, xEventPtr xe, DeviceIntPtr dev, int nevents)
|
||||||
{
|
{
|
||||||
char *text;
|
char *text;
|
||||||
text = QuartzReadCutBuffer();
|
text = QuartzReadCutBuffer();
|
||||||
|
@ -95,8 +97,8 @@ void QuartzWritePasteboard(void)
|
||||||
#define strequal(a, b) (0 == strcmp((a), (b)))
|
#define strequal(a, b) (0 == strcmp((a), (b)))
|
||||||
|
|
||||||
// Read Mac OS X pasteboard into X cut buffer
|
// Read Mac OS X pasteboard into X cut buffer
|
||||||
// Called by ProcessInputEvents() in response to request from X server thread.
|
// Called by mieqProcessInputEvents() in response to request from X server thread.
|
||||||
void QuartzReadPasteboard(void)
|
void QuartzReadPasteboard(int screenNum, xEventPtr xe, DeviceIntPtr dev, int nevents)
|
||||||
{
|
{
|
||||||
char *oldText = QuartzReadCutBuffer();
|
char *oldText = QuartzReadCutBuffer();
|
||||||
char *text = QuartzReadCocoaPasteboard();
|
char *text = QuartzReadCocoaPasteboard();
|
||||||
|
|
|
@ -34,11 +34,11 @@
|
||||||
#define _QUARTZPASTEBOARD_H
|
#define _QUARTZPASTEBOARD_H
|
||||||
|
|
||||||
// Aqua->X
|
// Aqua->X
|
||||||
void QuartzReadPasteboard(void);
|
void QuartzReadPasteboard(int, xEventPtr, DeviceIntPtr, int);
|
||||||
char * QuartzReadCocoaPasteboard(void); // caller must free string
|
char * QuartzReadCocoaPasteboard(void); // caller must free string
|
||||||
|
|
||||||
// X->Aqua
|
// X->Aqua
|
||||||
void QuartzWritePasteboard(void);
|
void QuartzWritePasteboard(int, xEventPtr, DeviceIntPtr, int);
|
||||||
void QuartzWriteCocoaPasteboard(char *text);
|
void QuartzWriteCocoaPasteboard(char *text);
|
||||||
|
|
||||||
#endif /* _QUARTZPASTEBOARD_H */
|
#endif /* _QUARTZPASTEBOARD_H */
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "quartzCommon.h"
|
#include "quartzCommon.h"
|
||||||
|
#include "inputstr.h"
|
||||||
#include "quartz.h"
|
#include "quartz.h"
|
||||||
#include "xpr.h"
|
#include "xpr.h"
|
||||||
#include "pseudoramiX.h"
|
#include "pseudoramiX.h"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user