andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

just a bit of juggling headers around -- we're preparing

Browse Source 
to call our Xquartz-specific event handlers directly
as mieqHandlers
This commit is contained in:
Ben Byer 2008-03-31 20:18:58 -07:00
parent 1e0ec02202
commit 4aedba5aa7
7 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xquartz/darwin.c
View File

@ -887,7 +887,7 @@ void AbortDDX( void )
*/
void
xf86SetRootClip (ScreenPtr pScreen, BOOL enable)
xf86SetRootClip (ScreenPtr pScreen, int enable)
{
WindowPtr pWin = WindowTable[pScreen->myNum];
WindowPtr pChild;

2
hw/xquartz/darwin.h
View File

@ -54,7 +54,7 @@ typedef struct {
void DarwinPrintBanner(void);
int DarwinParseModifierList(const char *constmodifiers);
void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);
void xf86SetRootClip (ScreenPtr pScreen, BOOL enable);
void xf86SetRootClip (ScreenPtr pScreen, int enable);
#define SCREEN_PRIV(pScreen) \
((DarwinFramebufferPtr)pScreen->devPrivates[darwinScreenIndex].ptr)

3
hw/xquartz/quartz.c
View File

@ -33,6 +33,7 @@
#endif
#include "quartzCommon.h"
#include "inputstr.h"
#include "quartz.h"
#include "darwin.h"
#include "darwinEvents.h"
@ -497,6 +498,7 @@ void QuartzProcessEvent(xEvent *xe) {
GiveUp(0);
break;
#if 0
case kXquartzReadPasteboard:
QuartzReadPasteboard();
break;
@ -504,6 +506,7 @@ void QuartzProcessEvent(xEvent *xe) {
case kXquartzWritePasteboard:
QuartzWritePasteboard();
break;
#endif
case kXquartzBringAllToFront:
DEBUG_LOG("kXquartzBringAllToFront\n");

3
hw/xquartz/quartzCocoa.m
View File

@ -37,13 +37,14 @@
#endif
#include "quartzCommon.h"
#include "inputstr.h"
#include "quartzPasteboard.h"
#define BOOL xBOOL
#include "darwin.h"
#undef BOOL
#include <Cocoa/Cocoa.h>
#undef BOOL
#include "pseudoramiX.h"

10
hw/xquartz/quartzPasteboard.c
View File

@ -34,6 +34,8 @@
#include <dix-config.h>
#endif
#include "misc.h"
#include "inputstr.h"
#include "quartzPasteboard.h"
#include <X11/Xatom.h>
@ -81,8 +83,8 @@ static char * QuartzReadCutBuffer(void)
}
// Write X cut buffer to Mac OS X pasteboard
// Called by ProcessInputEvents() in response to request from X server thread.
void QuartzWritePasteboard(void)
// Called by mieqProcessInputEvents() in response to request from X server thread.
void QuartzWritePasteboard(int screenNum, xEventPtr xe, DeviceIntPtr dev, int nevents)
{
char *text;
text = QuartzReadCutBuffer();
@ -95,8 +97,8 @@ void QuartzWritePasteboard(void)
#define strequal(a, b) (0 == strcmp((a), (b)))
// Read Mac OS X pasteboard into X cut buffer
// Called by ProcessInputEvents() in response to request from X server thread.
void QuartzReadPasteboard(void)
// Called by mieqProcessInputEvents() in response to request from X server thread.
void QuartzReadPasteboard(int screenNum, xEventPtr xe, DeviceIntPtr dev, int nevents)
{
char *oldText = QuartzReadCutBuffer();
char *text = QuartzReadCocoaPasteboard();

4
hw/xquartz/quartzPasteboard.h
View File

@ -34,11 +34,11 @@
#define _QUARTZPASTEBOARD_H
// Aqua->X
void QuartzReadPasteboard(void);
void QuartzReadPasteboard(int, xEventPtr, DeviceIntPtr, int);
char * QuartzReadCocoaPasteboard(void); // caller must free string
// X->Aqua
void QuartzWritePasteboard(void);
void QuartzWritePasteboard(int, xEventPtr, DeviceIntPtr, int);
void QuartzWriteCocoaPasteboard(char *text);
#endif /* _QUARTZPASTEBOARD_H */

1
hw/xquartz/xpr/xprScreen.c
View File

@ -32,6 +32,7 @@
#endif
#include "quartzCommon.h"
#include "inputstr.h"
#include "quartz.h"
#include "xpr.h"
#include "pseudoramiX.h"