summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/X11/extensions/Xxf86dga.h2
-rw-r--r--include/X11/extensions/xf86dga1.h2
-rw-r--r--man/XDGA.man6
-rw-r--r--src/Makefile.am2
-rw-r--r--src/XF86DGA.c34
-rw-r--r--src/XF86DGA2.c56
6 files changed, 51 insertions, 51 deletions
diff --git a/include/X11/extensions/Xxf86dga.h b/include/X11/extensions/Xxf86dga.h
index 3b14ff3..d78a032 100644
--- a/include/X11/extensions/Xxf86dga.h
+++ b/include/X11/extensions/Xxf86dga.h
@@ -150,7 +150,7 @@ int XDGAGetViewportStatus(
Display *dpy,
int screen
);
-
+
void XDGASync(
Display *dpy,
int screen
diff --git a/include/X11/extensions/xf86dga1.h b/include/X11/extensions/xf86dga1.h
index 0fc97aa..8110438 100644
--- a/include/X11/extensions/xf86dga1.h
+++ b/include/X11/extensions/xf86dga1.h
@@ -37,7 +37,7 @@ Status XF86DGAGetVideoLL(
unsigned int * /* base addr */,
int * /* width */,
int * /* bank_size */,
- int * /* ram_size */
+ int * /* ram_size */
);
Status XF86DGAGetVideo(
diff --git a/man/XDGA.man b/man/XDGA.man
index 2121787..4510bcd 100644
--- a/man/XDGA.man
+++ b/man/XDGA.man
@@ -1,4 +1,4 @@
-.\"
+.\"
.TH XDGA 3 __vendorversion__
.SH NAME
XDGA \- Client library for the XFree86-DGA extension.
@@ -230,7 +230,7 @@ Each
corresponds to a different framebuffer layout.
.PP
.BR XDGAQueryModes ()
-returns a pointer to an array of
+returns a pointer to an array of
.IR XDGAMode s
which are valid for the given screen.
.I num
@@ -382,7 +382,7 @@ function.
.I maxViewportX
.TP 8
.I maxViewportY
-The maximum x and y positions possible with the
+The maximum x and y positions possible with the
.BR XDGASetViewport ()
function.
.TP 8
diff --git a/src/Makefile.am b/src/Makefile.am
index edfb90a..fbde550 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ AM_CFLAGS = -I $(top_srcdir)/include \
$(XXF86DGA_CFLAGS) \
$(MALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
-
+
libXxf86dga_la_LIBADD = $(XXF86DGA_LIBS)
libXxf86dga_la_LDFLAGS = -version-number 1:0:0
diff --git a/src/XF86DGA.c b/src/XF86DGA.c
index 4effcaf..71484b7 100644
--- a/src/XF86DGA.c
+++ b/src/XF86DGA.c
@@ -86,7 +86,7 @@ Bool XF86DGAQueryExtension (
Bool XF86DGAQueryVersion(
Display* dpy,
- int* majorVersion,
+ int* majorVersion,
int* minorVersion
){
return XDGAQueryVersion(dpy, majorVersion, minorVersion);
@@ -96,8 +96,8 @@ Bool XF86DGAGetVideoLL(
Display* dpy,
int screen,
unsigned int *offset,
- int *width,
- int *bank_size,
+ int *width,
+ int *bank_size,
int *ram_size
){
XExtDisplayInfo *info = xdga_find_display (dpy);
@@ -121,13 +121,13 @@ Bool XF86DGAGetVideoLL(
*width = rep.width;
*bank_size = rep.bank_size;
*ram_size = rep.ram_size;
-
+
UnlockDisplay(dpy);
SyncHandle();
return True;
}
-
+
Bool XF86DGADirectVideoLL(
Display* dpy,
int screen,
@@ -153,7 +153,7 @@ Bool XF86DGADirectVideoLL(
Bool XF86DGAGetViewPortSize(
Display* dpy,
int screen,
- int *width,
+ int *width,
int *height
){
XExtDisplayInfo *info = xdga_find_display (dpy);
@@ -175,17 +175,17 @@ Bool XF86DGAGetViewPortSize(
*width = rep.width;
*height = rep.height;
-
+
UnlockDisplay(dpy);
SyncHandle();
return True;
}
-
-
+
+
Bool XF86DGASetViewPort(
Display* dpy,
int screen,
- int x,
+ int x,
int y
){
XExtDisplayInfo *info = xdga_find_display (dpy);
@@ -206,7 +206,7 @@ Bool XF86DGASetViewPort(
return True;
}
-
+
Bool XF86DGAGetVidPage(
Display* dpy,
int screen,
@@ -235,7 +235,7 @@ Bool XF86DGAGetVidPage(
return True;
}
-
+
Bool XF86DGASetVidPage(
Display* dpy,
int screen,
@@ -342,7 +342,7 @@ Bool XF86DGAViewPortChanged(
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
-#if defined(ISC)
+#if defined(ISC)
# define HAS_SVR3_MMAP
# include <sys/types.h>
# include <errno.h>
@@ -548,7 +548,7 @@ MapPhysAddress(unsigned long address, unsigned long size)
if (rc != 0)
return NULL;
#elif defined(Lynx) && defined(NO_MMAP)
- vaddr = (void *)smem_create("XF86DGA", (char *)offset,
+ vaddr = (void *)smem_create("XF86DGA", (char *)offset,
size + delta, SM_READ|SM_WRITE);
#else
#ifndef MAP_FILE
@@ -670,8 +670,8 @@ XF86DGAGetVideo(
Display *dis,
int screen,
char **addr,
- int *width,
- int *bank,
+ int *width,
+ int *bank,
int *ram
){
unsigned int offset;
@@ -710,7 +710,7 @@ XF86DGAGetVideo(
signal(SIGBUS, XF86cleanup);
#endif
signal(SIGHUP, XF86cleanup);
- signal(SIGFPE, XF86cleanup);
+ signal(SIGFPE, XF86cleanup);
}
return 1;
diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
index d241ff7..fbc84cb 100644
--- a/src/XF86DGA2.c
+++ b/src/XF86DGA2.c
@@ -30,7 +30,7 @@ char *xdga_extension_name = XF86DGANAME;
static XExtensionInfo _xdga_info_data;
static XExtensionInfo *xdga_info = &_xdga_info_data;
-
+
Bool XDGAMapFramebuffer(int, char *, unsigned char*, CARD32, CARD32, CARD32);
void XDGAUnmapFramebuffer(int);
unsigned char* XDGAGetMappedMemory(int);
@@ -66,9 +66,9 @@ static XEXT_GENERATE_CLOSE_DISPLAY (xdga_close_display, xdga_info)
XExtDisplayInfo* xdga_find_display(Display*);
-XEXT_GENERATE_FIND_DISPLAY (xdga_find_display, xdga_info,
- "XFree86-DGA",
- &xdga_extension_hooks,
+XEXT_GENERATE_FIND_DISPLAY (xdga_find_display, xdga_info,
+ "XFree86-DGA",
+ &xdga_extension_hooks,
0, NULL)
@@ -154,7 +154,7 @@ Bool XDGAQueryExtension (
Bool XDGAQueryVersion(
Display *dpy,
- int *majorVersion,
+ int *majorVersion,
int *minorVersion
){
XExtDisplayInfo *info = xdga_find_display (dpy);
@@ -182,7 +182,7 @@ Bool XDGAQueryVersion(
for (i = 0, j = info->codes->first_event;
i < XF86DGANumberEvents;
- i++, j++)
+ i++, j++)
{
XESetWireToEvent (dpy, j, xdga_wire_to_event);
XESetEventToWire (dpy, j, xdga_event_to_wire);
@@ -240,11 +240,11 @@ Bool XDGAOpenFramebuffer(
}
ret = XDGAMapFramebuffer(screen, deviceName,
- (unsigned char*)(long)rep.mem1,
+ (unsigned char*)(long)rep.mem1,
rep.size, rep.offset, rep.extra);
if(deviceName)
- Xfree(deviceName);
+ Xfree(deviceName);
UnlockDisplay(dpy);
SyncHandle();
@@ -305,12 +305,12 @@ XDGAMode* XDGAQueryModes(
offset = (char*)(&modes[rep.number]); /* start of text */
- if(modes) {
+ if(modes) {
for(i = 0; i < rep.number; i++) {
_XRead(dpy, (char*)(&info), sz_xXDGAModeInfo);
modes[i].num = info.num;
- modes[i].verticalRefresh =
+ modes[i].verticalRefresh =
(float)info.vsync_num / (float)info.vsync_den;
modes[i].flags = info.flags;
modes[i].imageWidth = info.image_width;
@@ -333,7 +333,7 @@ XDGAMode* XDGAQueryModes(
modes[i].maxViewportY = info.viewport_ymax;
modes[i].viewportFlags = info.viewport_flags;
modes[i].reserved1 = info.reserved1;
- modes[i].reserved2 = info.reserved2;
+ modes[i].reserved2 = info.reserved2;
_XRead(dpy, offset, info.name_size);
modes[i].name = offset;
@@ -352,7 +352,7 @@ XDGAMode* XDGAQueryModes(
}
-XDGADevice *
+XDGADevice *
XDGASetMode(
Display *dpy,
int screen,
@@ -373,7 +373,7 @@ XDGASetMode(
req->screen = screen;
req->mode = mode;
req->pid = pid = XAllocID(dpy);
-
+
if (_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
if(rep.length) {
xXDGAModeInfo info;
@@ -383,12 +383,12 @@ XDGASetMode(
size -= sz_xXDGAModeInfo; /* get text size */
dev = (XDGADevice*)Xmalloc(sizeof(XDGADevice) + size);
-
+
if(dev) {
_XRead(dpy, (char*)(&info), sz_xXDGAModeInfo);
dev->mode.num = info.num;
- dev->mode.verticalRefresh =
+ dev->mode.verticalRefresh =
(float)info.vsync_num / (float)info.vsync_den;
dev->mode.flags = info.flags;
dev->mode.imageWidth = info.image_width;
@@ -413,7 +413,7 @@ XDGASetMode(
dev->mode.reserved1 = info.reserved1;
dev->mode.reserved2 = info.reserved2;
- dev->mode.name = (char*)(&dev[1]);
+ dev->mode.name = (char*)(&dev[1]);
_XRead(dpy, dev->mode.name, info.name_size);
dev->pixmap = (rep.flags & XDGAPixmap) ? pid : 0;
@@ -421,7 +421,7 @@ XDGASetMode(
if(dev->data)
dev->data += rep.offset;
- }
+ }
/* not sure what to do if the allocation fails */
}
}
@@ -591,7 +591,7 @@ void XDGACopyTransparentArea(
int XDGAGetViewportStatus(
Display *dpy,
- int screen
+ int screen
){
XExtDisplayInfo *info = xdga_find_display (dpy);
xXDGAGetViewportStatusReply rep;
@@ -614,7 +614,7 @@ int XDGAGetViewportStatus(
void XDGASync(
Display *dpy,
- int screen
+ int screen
){
XExtDisplayInfo *info = xdga_find_display (dpy);
xXDGASyncReply rep;
@@ -638,7 +638,7 @@ void XDGAChangePixmapMode(
int screen,
int *x,
int *y,
- int mode
+ int mode
){
XExtDisplayInfo *info = xdga_find_display (dpy);
xXDGAChangePixmapModeReq *req;
@@ -689,7 +689,7 @@ Colormap XDGACreateColormap(
void XDGAKeyEventToXKeyEvent(
- XDGAKeyEvent* dk,
+ XDGAKeyEvent* dk,
XKeyEvent* xk
){
xk->type = dk->type;
@@ -710,7 +710,7 @@ void XDGAKeyEventToXKeyEvent(
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
-#if defined(ISC)
+#if defined(ISC)
# define HAS_SVR3_MMAP
# include <sys/types.h>
# include <errno.h>
@@ -760,7 +760,7 @@ typedef struct _DGAMapRec{
} DGAMapRec, *DGAMapPtr;
static Bool
-DGAMapPhysical(int, char*, unsigned char*, CARD32, CARD32, CARD32, DGAMapPtr);
+DGAMapPhysical(int, char*, unsigned char*, CARD32, CARD32, CARD32, DGAMapPtr);
static void DGAUnmapPhysical(DGAMapPtr);
static DGAMapPtr _Maps = NULL;
@@ -794,7 +794,7 @@ XDGAMapFramebuffer(
){
DGAMapPtr pMap = _Maps;
Bool result;
-
+
/* is it already mapped ? */
while(pMap != NULL) {
if(pMap->screen == screen)
@@ -815,9 +815,9 @@ XDGAMapFramebuffer(
if(result) {
pMap->next = _Maps;
_Maps = pMap;
- } else
+ } else
Xfree(pMap);
-
+
return result;
}
@@ -866,7 +866,7 @@ DGAMapPhysical(
ULONG action;
HFILE hfd;
#endif
-
+
base += offset;
pMap->screen = screen;
@@ -927,7 +927,7 @@ DGAMapPhysical(
name = DEV_MEM;
if ((pMap->fd = open(name, O_RDWR)) < 0)
return False;
- pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
+ pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
if (pMap->virtual == (void *)-1)
return False;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 20:23:24 +0000