From a13b75f056f9f9efcf6ecb8610b40ddbbb2bbb69 Mon Sep 17 00:00:00 2001 From: marha <marha@users.sourceforge.net> Date: Wed, 19 Jan 2011 17:29:52 +0000 Subject: xserver pixman mesa git update 19 jan 2011 --- xorg-server/hw/kdrive/ephyr/Makefile.am | 18 +----- xorg-server/hw/kdrive/ephyr/Xephyr.man.pre | 89 ----------------------------- xorg-server/hw/kdrive/ephyr/man/Makefile.am | 2 + xorg-server/hw/kdrive/ephyr/man/Xephyr.man | 87 ++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+), 104 deletions(-) delete mode 100644 xorg-server/hw/kdrive/ephyr/Xephyr.man.pre create mode 100644 xorg-server/hw/kdrive/ephyr/man/Makefile.am create mode 100644 xorg-server/hw/kdrive/ephyr/man/Xephyr.man (limited to 'xorg-server/hw/kdrive') diff --git a/xorg-server/hw/kdrive/ephyr/Makefile.am b/xorg-server/hw/kdrive/ephyr/Makefile.am index 8646703ad..9d9b64ee5 100644 --- a/xorg-server/hw/kdrive/ephyr/Makefile.am +++ b/xorg-server/hw/kdrive/ephyr/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = man + INCLUDES = \ @KDRIVE_INCS@ \ @KDRIVE_CFLAGS@ \ @@ -83,20 +85,6 @@ Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) relink: $(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS) -MAN_SRCS = Xephyr.man.pre - -appmandir = $(APP_MAN_DIR) -appman_DATA = Xephyr.$(APP_MAN_SUFFIX) - -Xephyr.$(APP_MAN_SUFFIX): Xephyr.man - -$(AM_V_at)rm -f Xephyr.$(APP_MAN_SUFFIX) - $(AM_V_at)$(LN_S) Xephyr.man Xephyr.$(APP_MAN_SUFFIX) - -include $(top_srcdir)/cpprules.in - -CLEANFILES = $(appman_DATA) Xephyr.man - EXTRA_DIST = \ $(HOSTVIDEO_SRCS) \ - $(HOSTDRI_SRCS) \ - $(MAN_SRCS) + $(HOSTDRI_SRCS) diff --git a/xorg-server/hw/kdrive/ephyr/Xephyr.man.pre b/xorg-server/hw/kdrive/ephyr/Xephyr.man.pre deleted file mode 100644 index eb80b96b0..000000000 --- a/xorg-server/hw/kdrive/ephyr/Xephyr.man.pre +++ /dev/null @@ -1,89 +0,0 @@ -." -." Copyright (c) Matthieu Herrb <matthieu@herrb.eu> -." -." Permission to use, copy, modify, and distribute this software for any -." purpose with or without fee is hereby granted, provided that the above -." copyright notice and this permission notice appear in all copies. -." -." THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -." WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -." MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -." ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -." WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -." ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -." OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -." -.TH Xephyr __appmansuffix__ __vendorversion__ -.SH NAME -Xephyr - X server outputting to a window on a pre-existing X display -.SH SYNOPSIS -.B Xephyr -.RI [\fB:\fP display ] -.RI [ option -.IR ... ] -.SH DESCRIPTION -.B Xephyr -is a kdrive server that outputs to a window on a pre-existing "host" -X display. -Think -.I Xnest -but with support for modern extensions like composite, damage and randr. -.PP -Unlike -.I Xnest -which is an X proxy, i.e. limited to the capabilities of the host X server, -.B Xephyr -is a real X server which -uses the host X server window as "framebuffer" via fast SHM XImages. -.PP -It also has support for "visually" debugging what the server is -painting. -.SH OPTIONS -.TP 8 -.BI -screen " width" x height -sets the screen size. -.TP 8 -.BI -parent " id" -uses exiting window -.I id . -If a -.BI -screen -argument follows a -.BI -parent -argument, this screen is embedded into the given window. -.TP 8 -.B -host-cursor -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 negligible. -.SH "SIGNALS" -Send a SIGUSR1 to the server (e.g. pkill -USR1 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. -.SH CAVEATS -.PP -.IP \(bu 2 -Rotated displays are currently updated via full blits. This -is slower than a normal orientated display. Debug mode will -therefore not be of much use rotated. -.IP \(bu 2 -The '-host-cursor' cursor is static in its appearance. -.IP \(bu 2 -The build gets a warning about 'nanosleep'. I think the various '-D' -build flags are causing this. I haven't figured as yet how to work -round it. It doesn't appear to break anything however. -.IP \(bu 2 -Keyboard handling is basic but works. -.TP \(bu 2 -Mouse button 5 probably won't work. -.SH "SEE ALSO" -X(__miscmansuffix__), Xserver(__appmansuffix__) -.SH AUTHOR -Matthew Allum <mallum@o-hand.com> 2004 - - diff --git a/xorg-server/hw/kdrive/ephyr/man/Makefile.am b/xorg-server/hw/kdrive/ephyr/man/Makefile.am new file mode 100644 index 000000000..e8a372143 --- /dev/null +++ b/xorg-server/hw/kdrive/ephyr/man/Makefile.am @@ -0,0 +1,2 @@ +include $(top_srcdir)/manpages.am +appman_PRE = Xephyr.man diff --git a/xorg-server/hw/kdrive/ephyr/man/Xephyr.man b/xorg-server/hw/kdrive/ephyr/man/Xephyr.man new file mode 100644 index 000000000..8e7bfd550 --- /dev/null +++ b/xorg-server/hw/kdrive/ephyr/man/Xephyr.man @@ -0,0 +1,87 @@ +." +." Copyright (c) Matthieu Herrb <matthieu@herrb.eu> +." +." Permission to use, copy, modify, and distribute this software for any +." purpose with or without fee is hereby granted, provided that the above +." copyright notice and this permission notice appear in all copies. +." +." THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +." WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +." MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +." ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +." WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +." ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +." OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +." +.TH Xephyr __appmansuffix__ __vendorversion__ +.SH NAME +Xephyr - X server outputting to a window on a pre-existing X display +.SH SYNOPSIS +.B Xephyr +.RI [\fB:\fP display ] +.RI [ option +.IR ... ] +.SH DESCRIPTION +.B Xephyr +is a kdrive server that outputs to a window on a pre-existing "host" +X display. +Think +.I Xnest +but with support for modern extensions like composite, damage and randr. +.PP +Unlike +.I Xnest +which is an X proxy, i.e. limited to the capabilities of the host X server, +.B Xephyr +is a real X server which +uses the host X server window as "framebuffer" via fast SHM XImages. +.PP +It also has support for "visually" debugging what the server is +painting. +.SH OPTIONS +.TP 8 +.BI -screen " width" x height +sets the screen size. +.TP 8 +.BI -parent " id" +uses exiting window +.I id . +If a +.BI -screen +argument follows a +.BI -parent +argument, this screen is embedded into the given window. +.TP 8 +.B -host-cursor +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 negligible. +.SH "SIGNALS" +Send a SIGUSR1 to the server (e.g. pkill -USR1 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. +.SH CAVEATS +.PP +.IP \(bu 2 +Rotated displays are currently updated via full blits. This +is slower than a normal orientated display. Debug mode will +therefore not be of much use rotated. +.IP \(bu 2 +The '-host-cursor' cursor is static in its appearance. +.IP \(bu 2 +The build gets a warning about 'nanosleep'. I think the various '-D' +build flags are causing this. I haven't figured as yet how to work +round it. It doesn't appear to break anything however. +.IP \(bu 2 +Keyboard handling is basic but works. +.TP \(bu 2 +Mouse button 5 probably won't work. +.SH "SEE ALSO" +X(__miscmansuffix__), Xserver(__appmansuffix__) +.SH AUTHOR +Matthew Allum <mallum@o-hand.com> 2004 -- cgit v1.2.3