diff options
Diffstat (limited to 'xserver/hw/xprint')
| -rw-r--r-- | xserver/hw/xprint/Makefile.am | 4 | ||||
| -rw-r--r-- | xserver/hw/xprint/Makefile.in | 4 | ||||
| -rw-r--r-- | xserver/hw/xprint/ddxInit.c | 23 |
3 files changed, 26 insertions, 5 deletions
diff --git a/xserver/hw/xprint/Makefile.am b/xserver/hw/xprint/Makefile.am index f2d41467f..b9a7de070 100644 --- a/xserver/hw/xprint/Makefile.am +++ b/xserver/hw/xprint/Makefile.am @@ -12,7 +12,7 @@ Xprt_LDFLAGS = -L$(top_srcdir) Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \ pcl/libpcl.la pcl-mono/libpcl.la $(top_builddir)/fb/libfb.la \ $(top_builddir)/render/librender.la $(top_builddir)/mi/libmi.la \ - $(top_builddir)/Xext/libXext.la @FREETYPE_LIBS@ + $(top_builddir)/Xext/libXext.la @FREETYPE_LIBS@ @XSERVER_LIBS@ miinitext-wrapper.c: echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@ @@ -41,3 +41,5 @@ Xprt_SOURCES = \ $(top_srcdir)/fb/fbcmap_mi.c EXTRA_DIST = ValTree.c + +CLEANFILES = miinitext-wrapper.c dpmsstubs-wrapper.c diff --git a/xserver/hw/xprint/Makefile.in b/xserver/hw/xprint/Makefile.in index b9d933009..163d36a01 100644 --- a/xserver/hw/xprint/Makefile.in +++ b/xserver/hw/xprint/Makefile.in @@ -631,7 +631,7 @@ Xprt_LDFLAGS = -L$(top_srcdir) Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \ pcl/libpcl.la pcl-mono/libpcl.la $(top_builddir)/fb/libfb.la \ $(top_builddir)/render/librender.la $(top_builddir)/mi/libmi.la \ - $(top_builddir)/Xext/libXext.la @FREETYPE_LIBS@ + $(top_builddir)/Xext/libXext.la @FREETYPE_LIBS@ @XSERVER_LIBS@ Xprt_SOURCES = \ attributes.c \ @@ -654,6 +654,7 @@ Xprt_SOURCES = \ $(top_srcdir)/fb/fbcmap_mi.c EXTRA_DIST = ValTree.c +CLEANFILES = miinitext-wrapper.c dpmsstubs-wrapper.c all: all-recursive .SUFFIXES: @@ -1121,6 +1122,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) diff --git a/xserver/hw/xprint/ddxInit.c b/xserver/hw/xprint/ddxInit.c index 6cd3cfd3c..1e7652e60 100644 --- a/xserver/hw/xprint/ddxInit.c +++ b/xserver/hw/xprint/ddxInit.c @@ -89,6 +89,12 @@ InitOutput( } +void +DDXRingBell(int volume, int pitch, int duration) +{ + /* dummy func; link fails without */ +} + static void BellProc( int volume, @@ -156,9 +162,9 @@ PointerProc( { map[0] = 0; InitPointerDeviceStruct(pPtr, map, NUM_BUTTONS, - miPointerGetMotionEvents, + GetMotionHistory, (PtrCtrlProcPtr)_XpVoidNoop, - miPointerGetMotionBufferSize()); + GetMotionHistorySize(), 2); break; } case DEVICE_ON: @@ -189,7 +195,7 @@ InitInput( Bool LegalModifier( unsigned int key, - DevicePtr dev) + DeviceIntPtr dev) { return TRUE; } @@ -304,6 +310,17 @@ ChangeDeviceControl ( return BadMatch; } +int +NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) +{ + return BadValue; +} + +void +DeleteInputDeviceRequest(DeviceIntPtr dev) +{ +} + void OpenInputDevice ( DeviceIntPtr dev, |