From 990bc3f015a4f8fce2eb918375defcd44980a845 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 8 Jun 2012 09:33:13 +0200 Subject: Used synchronise script to update files --- xorg-server/hw/kdrive/Makefile.am | 60 ++++++------- xorg-server/hw/kdrive/Xkdrive.man | 114 ++++++++++++------------- xorg-server/hw/kdrive/ephyr/.gitignore | 1 + xorg-server/hw/kdrive/ephyr/README | 146 ++++++++++++++++---------------- xorg-server/hw/kdrive/fake/.gitignore | 2 + xorg-server/hw/kdrive/fake/Makefile.am | 60 ++++++------- xorg-server/hw/kdrive/fbdev/.gitignore | 2 + xorg-server/hw/kdrive/fbdev/Makefile.am | 58 ++++++------- xorg-server/hw/kdrive/fbdev/Xfbdev.man | 56 ++++++------ xorg-server/hw/kdrive/linux/Makefile.am | 54 ++++++------ xorg-server/hw/kdrive/src/Makefile.am | 56 ++++++------ xorg-server/hw/kdrive/src/kdrive.c | 6 +- xorg-server/hw/kdrive/src/kdrive.h | 8 +- xorg-server/hw/kdrive/src/kinput.c | 4 +- xorg-server/hw/kdrive/src/kxv.c | 4 +- 15 files changed, 318 insertions(+), 313 deletions(-) create mode 100644 xorg-server/hw/kdrive/ephyr/.gitignore create mode 100644 xorg-server/hw/kdrive/fake/.gitignore create mode 100644 xorg-server/hw/kdrive/fbdev/.gitignore (limited to 'xorg-server/hw/kdrive') diff --git a/xorg-server/hw/kdrive/Makefile.am b/xorg-server/hw/kdrive/Makefile.am index 471ca89dd..3aebd0f43 100644 --- a/xorg-server/hw/kdrive/Makefile.am +++ b/xorg-server/hw/kdrive/Makefile.am @@ -1,30 +1,30 @@ -if BUILD_KDRIVEFBDEVLIB -FBDEV_SUBDIRS = fbdev -endif - -if XFAKESERVER -XFAKE_SUBDIRS = fake -endif - -if XEPHYR -XEPHYR_SUBDIRS = ephyr -endif - -if KDRIVELINUX -LINUX_SUBDIRS = linux -endif - -SERVER_SUBDIRS = \ - $(FBDEV_SUBDIRS) \ - $(XEPHYR_SUBDIRS) \ - $(XFAKE_SUBDIRS) - -SUBDIRS = \ - src \ - $(LINUX_SUBDIRS) \ - $(SERVER_SUBDIRS) - -DIST_SUBDIRS = fbdev ephyr src linux fake - -relink: - $(AM_V_at)for i in $(SERVER_SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done +if BUILD_KDRIVEFBDEVLIB +FBDEV_SUBDIRS = fbdev +endif + +if XFAKESERVER +XFAKE_SUBDIRS = fake +endif + +if XEPHYR +XEPHYR_SUBDIRS = ephyr +endif + +if KDRIVELINUX +LINUX_SUBDIRS = linux +endif + +SERVER_SUBDIRS = \ + $(FBDEV_SUBDIRS) \ + $(XEPHYR_SUBDIRS) \ + $(XFAKE_SUBDIRS) + +SUBDIRS = \ + src \ + $(LINUX_SUBDIRS) \ + $(SERVER_SUBDIRS) + +DIST_SUBDIRS = fbdev ephyr src linux fake + +relink: + $(AM_V_at)for i in $(SERVER_SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done diff --git a/xorg-server/hw/kdrive/Xkdrive.man b/xorg-server/hw/kdrive/Xkdrive.man index b37f9f10a..a2a2736ea 100644 --- a/xorg-server/hw/kdrive/Xkdrive.man +++ b/xorg-server/hw/kdrive/Xkdrive.man @@ -1,57 +1,57 @@ -.\" $RCSId: xc/programs/Xserver/hw/kdrive/Xkdrive.man,v 1.3 2001/01/24 00:06:10 dawes Exp $ -.\" -.TH Xkdrive 1 __vendorversion__ -.SH NAME -Xkdrive \- tiny X server -.SH SYNOPSIS -.B Xvesa -.RI [ :display ] -.RI [ option ...] - -.B Xfbdev -.RI [ :display ] -.RI [ option ...] -.SH DESCRIPTION -.B Xkdrive -is a family of X servers designed to be particularly small. This -manual page describes the common functionality of the -.B Xkdrive -servers; for information on a specific X server, please refer to the -relevant manual page. -.SH OPTIONS -In addition to the standard options accepted by all X servers (see -Xserver(1)), all the -.B Xkdrive -servers accept the following options: -.TP 8 -.B -card \fIpcmcia\fP -use pcmcia card as additional screen. -.TP 8 -.B -dumb -disable hardware acceleration. -.TP 8 -.B -origin \fIX\fP,\fIY\fP -Locates the next screen in the Xinerama virtual screen. -.TP 8 -.B -screen \fIwidth\fBx\fIheight\fR[\fBx\fIdepth\fR[\fBx\fIfreq\fR]]\fR[\fB@\fIrotation\fR]\fB -use a screen of the specified \fIwidth\fP, \fIheight\fP, screen \fIdepth\fP, \fIfrequency\fP, and \fIrotation\fP (0, 90, 180 and 270 are legal values). -.TP 8 -.B -softCursor -disable the hardware cursor. -.TP 8 -.B -videoTest -start the server, pause momentarily, and exit. -.TP 8 -.B -zaphod -disable switching screens by moving the pointer across a screen boundary. -.TP 8 -.B -2button -enable emulation of a middle mouse button by chording. -.TP 8 -.B -3button -disable emulation of a middle mouse button by chording. -.SH SEE ALSO -X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), Xvesa(1), Xfbdev(1). -.SH AUTHORS -The Xkdrive common core was written by Keith Packard, -and is based on the Sample Implementation of X. +.\" $RCSId: xc/programs/Xserver/hw/kdrive/Xkdrive.man,v 1.3 2001/01/24 00:06:10 dawes Exp $ +.\" +.TH Xkdrive 1 __vendorversion__ +.SH NAME +Xkdrive \- tiny X server +.SH SYNOPSIS +.B Xvesa +.RI [ :display ] +.RI [ option ...] + +.B Xfbdev +.RI [ :display ] +.RI [ option ...] +.SH DESCRIPTION +.B Xkdrive +is a family of X servers designed to be particularly small. This +manual page describes the common functionality of the +.B Xkdrive +servers; for information on a specific X server, please refer to the +relevant manual page. +.SH OPTIONS +In addition to the standard options accepted by all X servers (see +Xserver(1)), all the +.B Xkdrive +servers accept the following options: +.TP 8 +.B -card \fIpcmcia\fP +use pcmcia card as additional screen. +.TP 8 +.B -dumb +disable hardware acceleration. +.TP 8 +.B -origin \fIX\fP,\fIY\fP +Locates the next screen in the Xinerama virtual screen. +.TP 8 +.B -screen \fIwidth\fBx\fIheight\fR[\fBx\fIdepth\fR[\fBx\fIfreq\fR]]\fR[\fB@\fIrotation\fR]\fB +use a screen of the specified \fIwidth\fP, \fIheight\fP, screen \fIdepth\fP, \fIfrequency\fP, and \fIrotation\fP (0, 90, 180 and 270 are legal values). +.TP 8 +.B -softCursor +disable the hardware cursor. +.TP 8 +.B -videoTest +start the server, pause momentarily, and exit. +.TP 8 +.B -zaphod +disable switching screens by moving the pointer across a screen boundary. +.TP 8 +.B -2button +enable emulation of a middle mouse button by chording. +.TP 8 +.B -3button +disable emulation of a middle mouse button by chording. +.SH SEE ALSO +X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), Xvesa(1), Xfbdev(1). +.SH AUTHORS +The Xkdrive common core was written by Keith Packard, +and is based on the Sample Implementation of X. diff --git a/xorg-server/hw/kdrive/ephyr/.gitignore b/xorg-server/hw/kdrive/ephyr/.gitignore new file mode 100644 index 000000000..4962d1ef0 --- /dev/null +++ b/xorg-server/hw/kdrive/ephyr/.gitignore @@ -0,0 +1 @@ +Xephyr diff --git a/xorg-server/hw/kdrive/ephyr/README b/xorg-server/hw/kdrive/ephyr/README index 6d6a222ef..7b26fcf33 100644 --- a/xorg-server/hw/kdrive/ephyr/README +++ b/xorg-server/hw/kdrive/ephyr/README @@ -1,73 +1,73 @@ -Xephyr README -============= - - -What Is It ? -============ - -Xephyr is a a kdrive server that outputs to a window on a pre-existing -'host' X display. Think Xnest but with support for modern extensions -like composite, damage and randr. - -Unlike Xnest which is an X proxy, i.e. limited to the -capabilities of the host X server, Xephyr is a real X server which -uses the host X server window as "framebuffer" via fast SHM XImages. - -It also has support for 'visually' debugging what the server is -painting. - - -How To Use -========== - -You probably want to run like; - -Xephyr :1 -ac -screen 800x600 & - -Then set DISPLAY=:1 and run whatever X apps you like. - -Use 'xrandr' to change to orientation/size. - -There is a '-parent' switch which works just like Xnests ( for use -with things like matchbox-nest - http://matchbox.handhelds.org ). - -There is also a '-host-cursor' switch to set 'cursor acceleration' - -The host's cursor is reused. This is only really there to aid -debugging by avoiding server paints for the cursor. Performance -improvement is negiable. - -Send a SIGUSR1 to the server ( eg kill -USR1 `pidof Xephyr` ) to -toggle the debugging mode. In this mode red rectangles are painted to -screen areas getting painted before painting the actual content. The -delay between this can be altered by setting a XEPHYR_PAUSE env var to -a value in micro seconds. - - -Caveats -======= - - - Depth is limited to being the same as the host. - *Update* As of 8/11/2004. Xephyr can now do 8bpp & 16bpp - on 24bpp host. - - - Rotated displays are currently updated via full blits. This - is slower than a normal oprientated display. Debug mode will - therefor not be of much use rotated. - - - The '-host-cursor' cursor is static in its appearence. - - - The build gets a warning about 'nanosleep'. I think the various '-D' - build flags are causing this. I havn't figured as yet how to work - round it. It doesn't appear to break anything however. - - - Keyboard handling is basic but works. - - - Mouse button 5 probably wont work. - - - - - -Matthew Allum 2004 - - +Xephyr README +============= + + +What Is It ? +============ + +Xephyr is a a kdrive server that outputs to a window on a pre-existing +'host' X display. Think Xnest but with support for modern extensions +like composite, damage and randr. + +Unlike Xnest which is an X proxy, i.e. limited to the +capabilities of the host X server, Xephyr is a real X server which +uses the host X server window as "framebuffer" via fast SHM XImages. + +It also has support for 'visually' debugging what the server is +painting. + + +How To Use +========== + +You probably want to run like; + +Xephyr :1 -ac -screen 800x600 & + +Then set DISPLAY=:1 and run whatever X apps you like. + +Use 'xrandr' to change to orientation/size. + +There is a '-parent' switch which works just like Xnests ( for use +with things like matchbox-nest - http://matchbox.handhelds.org ). + +There is also a '-host-cursor' switch to set 'cursor acceleration' - +The host's cursor is reused. This is only really there to aid +debugging by avoiding server paints for the cursor. Performance +improvement is negiable. + +Send a SIGUSR1 to the server ( eg kill -USR1 `pidof Xephyr` ) to +toggle the debugging mode. In this mode red rectangles are painted to +screen areas getting painted before painting the actual content. The +delay between this can be altered by setting a XEPHYR_PAUSE env var to +a value in micro seconds. + + +Caveats +======= + + - Depth is limited to being the same as the host. + *Update* As of 8/11/2004. Xephyr can now do 8bpp & 16bpp + on 24bpp host. + + - Rotated displays are currently updated via full blits. This + is slower than a normal oprientated display. Debug mode will + therefor not be of much use rotated. + + - The '-host-cursor' cursor is static in its appearence. + + - The build gets a warning about 'nanosleep'. I think the various '-D' + build flags are causing this. I havn't figured as yet how to work + round it. It doesn't appear to break anything however. + + - Keyboard handling is basic but works. + + - Mouse button 5 probably wont work. + + + + + +Matthew Allum 2004 + + diff --git a/xorg-server/hw/kdrive/fake/.gitignore b/xorg-server/hw/kdrive/fake/.gitignore new file mode 100644 index 000000000..c973ff076 --- /dev/null +++ b/xorg-server/hw/kdrive/fake/.gitignore @@ -0,0 +1,2 @@ +# Add & Override for this directory and it's subdirectories +Xfake diff --git a/xorg-server/hw/kdrive/fake/Makefile.am b/xorg-server/hw/kdrive/fake/Makefile.am index 6d3ed056e..76bbc3619 100644 --- a/xorg-server/hw/kdrive/fake/Makefile.am +++ b/xorg-server/hw/kdrive/fake/Makefile.am @@ -1,30 +1,30 @@ -INCLUDES = \ - @KDRIVE_INCS@ \ - @KDRIVE_CFLAGS@ - -noinst_LTLIBRARIES = libfake.la - -bin_PROGRAMS = Xfake - -libfake_la_SOURCES = \ - fake.c \ - kbd.c \ - os.c \ - mouse.c \ - fake.h - -Xfake_SOURCES = \ - fakeinit.c - -Xfake_LDADD = \ - libfake.la \ - @KDRIVE_LIBS@ - -Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) - -Xfake_DEPENDENCIES = \ - libfake.la \ - @KDRIVE_LOCAL_LIBS@ - -relink: - $(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS) +INCLUDES = \ + @KDRIVE_INCS@ \ + @KDRIVE_CFLAGS@ + +noinst_LTLIBRARIES = libfake.la + +bin_PROGRAMS = Xfake + +libfake_la_SOURCES = \ + fake.c \ + kbd.c \ + os.c \ + mouse.c \ + fake.h + +Xfake_SOURCES = \ + fakeinit.c + +Xfake_LDADD = \ + libfake.la \ + @KDRIVE_LIBS@ + +Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) + +Xfake_DEPENDENCIES = \ + libfake.la \ + @KDRIVE_LOCAL_LIBS@ + +relink: + $(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS) diff --git a/xorg-server/hw/kdrive/fbdev/.gitignore b/xorg-server/hw/kdrive/fbdev/.gitignore new file mode 100644 index 000000000..8569c9aed --- /dev/null +++ b/xorg-server/hw/kdrive/fbdev/.gitignore @@ -0,0 +1,2 @@ +# Add & Override for this directory and it's subdirectories +Xfbdev diff --git a/xorg-server/hw/kdrive/fbdev/Makefile.am b/xorg-server/hw/kdrive/fbdev/Makefile.am index ec9df95e0..98d667ebd 100644 --- a/xorg-server/hw/kdrive/fbdev/Makefile.am +++ b/xorg-server/hw/kdrive/fbdev/Makefile.am @@ -1,29 +1,29 @@ -INCLUDES = \ - @KDRIVE_INCS@ \ - @KDRIVE_CFLAGS@ - -noinst_LTLIBRARIES = libfbdev.la - -libfbdev_la_SOURCES = \ - fbdev.c \ - fbdev.h - -if KDRIVEFBDEV -bin_PROGRAMS = Xfbdev - -Xfbdev_SOURCES = \ - fbinit.c - -Xfbdev_LDADD = \ - libfbdev.la \ - @KDRIVE_LIBS@ - -Xfbdev_DEPENDENCIES = \ - libfbdev.la \ - $(KDRIVE_PURE_LIBS) - -Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) - -relink: - $(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS) -endif +INCLUDES = \ + @KDRIVE_INCS@ \ + @KDRIVE_CFLAGS@ + +noinst_LTLIBRARIES = libfbdev.la + +libfbdev_la_SOURCES = \ + fbdev.c \ + fbdev.h + +if KDRIVEFBDEV +bin_PROGRAMS = Xfbdev + +Xfbdev_SOURCES = \ + fbinit.c + +Xfbdev_LDADD = \ + libfbdev.la \ + @KDRIVE_LIBS@ + +Xfbdev_DEPENDENCIES = \ + libfbdev.la \ + $(KDRIVE_PURE_LIBS) + +Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) + +relink: + $(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS) +endif diff --git a/xorg-server/hw/kdrive/fbdev/Xfbdev.man b/xorg-server/hw/kdrive/fbdev/Xfbdev.man index bfdae168f..6d0c23818 100644 --- a/xorg-server/hw/kdrive/fbdev/Xfbdev.man +++ b/xorg-server/hw/kdrive/fbdev/Xfbdev.man @@ -1,28 +1,28 @@ -.\" $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man,v 1.4 2001/01/27 18:20:40 dawes Exp $ -.\" -.TH Xfbdev 1 __vendorversion__ -.SH NAME -Xfbdev \- Linux framebuffer device tiny X server -.SH SYNOPSIS -.B Xfbdev -.RI [ :display ] -.RI [ option ...] -.SH DESCRIPTION -.B Xfbdev -is a generic X server for Linux. -.B Xfbdev -doesn't know about any particular hardware, and uses the framebuffer -provided by the Linux framebuffer device. -.SH OPTIONS -.B Xfbdev -accepts the common options of the Xkdrive family of servers. Please -see Xkdrive(1). -.SH KEYBOARD -To be written. -.SH SEE ALSO -X(__miscmansuffix__), Xserver(1), Xkdrive(1), xdm(1), xinit(1). -.SH AUTHORS -The -.B Xfbdev -server was written by Keith Packard. - +.\" $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man,v 1.4 2001/01/27 18:20:40 dawes Exp $ +.\" +.TH Xfbdev 1 __vendorversion__ +.SH NAME +Xfbdev \- Linux framebuffer device tiny X server +.SH SYNOPSIS +.B Xfbdev +.RI [ :display ] +.RI [ option ...] +.SH DESCRIPTION +.B Xfbdev +is a generic X server for Linux. +.B Xfbdev +doesn't know about any particular hardware, and uses the framebuffer +provided by the Linux framebuffer device. +.SH OPTIONS +.B Xfbdev +accepts the common options of the Xkdrive family of servers. Please +see Xkdrive(1). +.SH KEYBOARD +To be written. +.SH SEE ALSO +X(__miscmansuffix__), Xserver(1), Xkdrive(1), xdm(1), xinit(1). +.SH AUTHORS +The +.B Xfbdev +server was written by Keith Packard. + diff --git a/xorg-server/hw/kdrive/linux/Makefile.am b/xorg-server/hw/kdrive/linux/Makefile.am index 93e5d2f9f..7946e5df3 100644 --- a/xorg-server/hw/kdrive/linux/Makefile.am +++ b/xorg-server/hw/kdrive/linux/Makefile.am @@ -1,27 +1,27 @@ -INCLUDES = \ - @KDRIVE_INCS@ \ - @KDRIVE_CFLAGS@ - -AM_CFLAGS = -DHAVE_DIX_CONFIG_H - -noinst_LTLIBRARIES = liblinux.la - -liblinux_la_SOURCES = - -liblinux_la_SOURCES += linux.c - -if KDRIVE_KBD -liblinux_la_SOURCES += keyboard.c -endif - -if KDRIVE_EVDEV -liblinux_la_SOURCES += evdev.c -endif - -if KDRIVE_MOUSE -liblinux_la_SOURCES += mouse.c ms.c ps2.c -endif - -if TSLIB -liblinux_la_SOURCES += tslib.c -endif +INCLUDES = \ + @KDRIVE_INCS@ \ + @KDRIVE_CFLAGS@ + +AM_CFLAGS = -DHAVE_DIX_CONFIG_H + +noinst_LTLIBRARIES = liblinux.la + +liblinux_la_SOURCES = + +liblinux_la_SOURCES += linux.c + +if KDRIVE_KBD +liblinux_la_SOURCES += keyboard.c +endif + +if KDRIVE_EVDEV +liblinux_la_SOURCES += evdev.c +endif + +if KDRIVE_MOUSE +liblinux_la_SOURCES += mouse.c ms.c ps2.c +endif + +if TSLIB +liblinux_la_SOURCES += tslib.c +endif diff --git a/xorg-server/hw/kdrive/src/Makefile.am b/xorg-server/hw/kdrive/src/Makefile.am index 51375b950..477ad673a 100644 --- a/xorg-server/hw/kdrive/src/Makefile.am +++ b/xorg-server/hw/kdrive/src/Makefile.am @@ -1,28 +1,28 @@ -INCLUDES = \ - @KDRIVE_INCS@ \ - @KDRIVE_CFLAGS@ - -AM_CFLAGS = -DHAVE_DIX_CONFIG_H - -noinst_LTLIBRARIES = libkdrive.la libkdrivestubs.la - -if XV -KDRIVE_XV_SOURCES = \ - kxv.c \ - kxv.h -endif - -libkdrive_la_SOURCES = \ - fourcc.h \ - kcmap.c \ - kdrive.c \ - kdrive.h \ - kinfo.c \ - kinput.c \ - kmode.c \ - kshadow.c \ - $(KDRIVE_XV_SOURCES) \ - $(top_srcdir)/mi/miinitext.c - -libkdrivestubs_la_SOURCES = \ - $(top_srcdir)/fb/fbcmap_mi.c +INCLUDES = \ + @KDRIVE_INCS@ \ + @KDRIVE_CFLAGS@ + +AM_CFLAGS = -DHAVE_DIX_CONFIG_H + +noinst_LTLIBRARIES = libkdrive.la libkdrivestubs.la + +if XV +KDRIVE_XV_SOURCES = \ + kxv.c \ + kxv.h +endif + +libkdrive_la_SOURCES = \ + fourcc.h \ + kcmap.c \ + kdrive.c \ + kdrive.h \ + kinfo.c \ + kinput.c \ + kmode.c \ + kshadow.c \ + $(KDRIVE_XV_SOURCES) \ + $(top_srcdir)/mi/miinitext.c + +libkdrivestubs_la_SOURCES = \ + $(top_srcdir)/fb/fbcmap_mi.c diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c index ecdae1921..a3b9434d1 100644 --- a/xorg-server/hw/kdrive/src/kdrive.c +++ b/xorg-server/hw/kdrive/src/kdrive.c @@ -606,7 +606,7 @@ KdCreateScreenResources(ScreenPtr pScreen) } Bool -KdCloseScreen(int index, ScreenPtr pScreen) +KdCloseScreen(ScreenPtr pScreen) { KdScreenPriv(pScreen); KdScreenInfo *screen = pScreenPriv->screen; @@ -616,7 +616,7 @@ KdCloseScreen(int index, ScreenPtr pScreen) pScreenPriv->closed = TRUE; pScreen->CloseScreen = pScreenPriv->CloseScreen; if (pScreen->CloseScreen) - ret = (*pScreen->CloseScreen) (index, pScreen); + ret = (*pScreen->CloseScreen) (pScreen); else ret = TRUE; @@ -776,7 +776,7 @@ KdSetSubpixelOrder(ScreenPtr pScreen, Rotation randr) static KdScreenInfo *kdCurrentScreen; Bool -KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) +KdScreenInit(ScreenPtr pScreen, int argc, char **argv) { KdScreenInfo *screen = kdCurrentScreen; KdCardInfo *card = screen->card; diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h index 293798aa0..a08a2182e 100644 --- a/xorg-server/hw/kdrive/src/kdrive.h +++ b/xorg-server/hw/kdrive/src/kdrive.h @@ -442,13 +442,13 @@ Bool KdCreateScreenResources(ScreenPtr pScreen); Bool - KdCloseScreen(int index, ScreenPtr pScreen); + KdCloseScreen(ScreenPtr pScreen); Bool KdSaveScreen(ScreenPtr pScreen, int on); Bool - KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv); + KdScreenInit(ScreenPtr pScreen, int argc, char **argv); void @@ -537,12 +537,12 @@ void void -KdBlockHandler(int screen, +KdBlockHandler(ScreenPtr pScreen, pointer blockData, pointer timeout, pointer readmask); void -KdWakeupHandler(int screen, +KdWakeupHandler(ScreenPtr pScreen, pointer data, unsigned long result, pointer readmask); void diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c index 66cdf675a..58ae55278 100644 --- a/xorg-server/hw/kdrive/src/kinput.c +++ b/xorg-server/hw/kdrive/src/kinput.c @@ -1972,7 +1972,7 @@ _KdEnqueuePointerEvent(KdPointerInfo * pi, int type, int x, int y, int z, } void -KdBlockHandler(int screen, pointer blockData, pointer timeout, pointer readmask) +KdBlockHandler(ScreenPtr pScreen, pointer blockData, pointer timeout, pointer readmask) { KdPointerInfo *pi; int myTimeout = 0; @@ -1998,7 +1998,7 @@ KdBlockHandler(int screen, pointer blockData, pointer timeout, pointer readmask) } void -KdWakeupHandler(int screen, +KdWakeupHandler(ScreenPtr pScreen, pointer data, unsigned long lresult, pointer readmask) { int result = (int) lresult; diff --git a/xorg-server/hw/kdrive/src/kxv.c b/xorg-server/hw/kdrive/src/kxv.c index 7097aee5c..b02dd88f2 100644 --- a/xorg-server/hw/kdrive/src/kxv.c +++ b/xorg-server/hw/kdrive/src/kxv.c @@ -58,7 +58,7 @@ of the copyright holder. /* XvScreenRec fields */ -static Bool KdXVCloseScreen(int, ScreenPtr); +static Bool KdXVCloseScreen(ScreenPtr); static int KdXVQueryAdaptors(ScreenPtr, XvAdaptorPtr *, int *); /* XvAdaptorRec fields */ @@ -1118,7 +1118,7 @@ KdXVClipNotify(WindowPtr pWin, int dx, int dy) /**** Required XvScreenRec fields ****/ static Bool -KdXVCloseScreen(int i, ScreenPtr pScreen) +KdXVCloseScreen(ScreenPtr pScreen) { XvScreenPtr pxvs = GET_XV_SCREEN(pScreen); KdXVScreenPtr ScreenPriv = GET_KDXV_SCREEN(pScreen); -- cgit v1.2.3