summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:30:29 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:30:29 +0000
commit690296df2e8b5a4cae8ba9b8f4d96bac96c3eb37 (patch)
tree537f584d2a936a1e2985b54fa7c2471c50cfb5b2
parentfb55131dba79ce0be116406bc694b47c4c529244 (diff)
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE
-rw-r--r--man/XF86VM.man89
-rw-r--r--src/XF86VMode.c2
2 files changed, 46 insertions, 45 deletions
diff --git a/man/XF86VM.man b/man/XF86VM.man
index e14dab5..1f02367 100644
--- a/man/XF86VM.man
+++ b/man/XF86VM.man
@@ -1,3 +1,4 @@
+.\" $XdotOrg: xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man,v 1.1.4.3.4.1 2004/03/04 17:47:35 eich Exp $
.\" $TOG: XF86VM.man /main/6 1997/07/19 10:30:39 kaleb $
.\"
.\"
@@ -184,66 +185,66 @@ Returns the current Y location of the viewport.
.ta 2.25i 3.5i
\fIVideo Mode Settings:\fP
typedef struct {
- unsigned short hdisplay; /* Number of display pixels horizontally */
- unsigned short hsyncstart; /* Horizontal sync start */
- unsigned short hsyncend; /* Horizontal sync end */
- unsigned short htotal; /* Total horizontal pixels */
- unsigned short vdisplay; /* Number of display pixels vertically */
- unsigned short vsyncstart; /* Vertical sync start */
- unsigned short vsyncend; /* Vertical sync start */
- unsigned short vtotal; /* Total vertical pixels */
- unsigned int flags; /* Mode flags */
- int privsize; /* Size of private */
- INT32 *private; /* Server privates */
+ unsigned short hdisplay; /\(** Number of display pixels horizontally */
+ unsigned short hsyncstart; /\(** Horizontal sync start */
+ unsigned short hsyncend; /\(** Horizontal sync end */
+ unsigned short htotal; /\(** Total horizontal pixels */
+ unsigned short vdisplay; /\(** Number of display pixels vertically */
+ unsigned short vsyncstart; /\(** Vertical sync start */
+ unsigned short vsyncend; /\(** Vertical sync start */
+ unsigned short vtotal; /\(** Total vertical pixels */
+ unsigned int flags; /\(** Mode flags */
+ int privsize; /\(** Size of private */
+ INT32 *private; /\(** Server privates */
} XF86VidModeModeLine;
.sp
typedef struct {
- unsigned int dotclock; /* Pixel clock */
- unsigned short hdisplay; /* Number of display pixels horizontally */
- unsigned short hsyncstart; /* Horizontal sync start */
- unsigned short hsyncend; /* Horizontal sync end */
- unsigned short htotal; /* Total horizontal pixels */
- unsigned short vdisplay; /* Number of display pixels vertically */
- unsigned short vsyncstart; /* Vertical sync start */
- unsigned short vsyncend; /* Vertical sync start */
- unsigned short vtotal; /* Total vertical pixels */
- unsigned int flags; /* Mode flags */
- int privsize; /* Size of private */
- INT32 *private; /* Server privates */
+ unsigned int dotclock; /\(** Pixel clock */
+ unsigned short hdisplay; /\(** Number of display pixels horizontally */
+ unsigned short hsyncstart; /\(** Horizontal sync start */
+ unsigned short hsyncend; /\(** Horizontal sync end */
+ unsigned short htotal; /\(** Total horizontal pixels */
+ unsigned short vdisplay; /\(** Number of display pixels vertically */
+ unsigned short vsyncstart; /\(** Vertical sync start */
+ unsigned short vsyncend; /\(** Vertical sync start */
+ unsigned short vtotal; /\(** Total vertical pixels */
+ unsigned int flags; /\(** Mode flags */
+ int privsize; /\(** Size of private */
+ INT32 *private; /\(** Server privates */
} XF86VidModeModeInfo;
.LP
\fIMonitor information:\fP
typedef struct {
- char* vendor; /* Name of manufacturer */
- char* model; /* Model name */
- float EMPTY; /* unused, for backward compatibility */
- unsigned char nhsync; /* Number of horiz sync ranges */
- XF86VidModeSyncRange* hsync; /* Horizontal sync ranges */
- unsigned char nvsync; /* Number of vert sync ranges */
- XF86VidModeSyncRange* vsync; /* Vertical sync ranges */
+ char* vendor; /\(** Name of manufacturer */
+ char* model; /\(** Model name */
+ float EMPTY; /\(** unused, for backward compatibility */
+ unsigned char nhsync; /\(** Number of horiz sync ranges */
+ XF86VidModeSyncRange* hsync; /\(** Horizontal sync ranges */
+ unsigned char nvsync; /\(** Number of vert sync ranges */
+ XF86VidModeSyncRange* vsync; /\(** Vertical sync ranges */
} XF86VidModeMonitor;
.sp
typedef struct {
- float hi; /* Top of range */
- float lo; /* Bottom of range */
+ float hi; /\(** Top of range */
+ float lo; /\(** Bottom of range */
} XF86VidModeSyncRange;
.LP
typedef struct {
- int type; /* of event */
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came from a SendEvent req */
- Display *display; /* Display the event was read from */
- Window root; /* root window of event screen */
- int state; /* What happened */
- int kind; /* What happened */
- Bool forced; /* extents of new region */
- Time time; /* event timestamp */
+ int type; /\(** of event */
+ unsigned long serial; /\(** # of last request processed by server */
+ Bool send_event; /\(** true if this came from a SendEvent req */
+ Display *display; /\(** Display the event was read from */
+ Window root; /\(** root window of event screen */
+ int state; /\(** What happened */
+ int kind; /\(** What happened */
+ Bool forced; /\(** extents of new region */
+ Time time; /\(** event timestamp */
} XF86VidModeNotifyEvent;
.LP
typedef struct {
- float red; /* Red Gamma value */
- float green; /* Green Gamma value */
- float blue; /* Blue Gamma value */
+ float red; /\(** Red Gamma value */
+ float green; /\(** Green Gamma value */
+ float blue; /\(** Blue Gamma value */
} XF86VidModeGamma;
.fi
.SH DESCRIPTION
diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index 3259db4..75a49d2 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -1,5 +1,5 @@
/* $XConsortium: XF86VMode.c /main/2 1995/11/14 18:17:58 kaleb $ */
-/* $XFree86: xc/lib/Xxf86vm/XF86VMode.c,v 3.34 2002/12/22 00:46:51 dawes Exp $ */
+/* $XFree86: xc/lib/Xxf86vm/XF86VMode.c,v 3.33 2002/10/16 00:37:34 dawes Exp $ */
/*
Copyright (c) 1995 Kaleb S. KEITHLEY