diff options
author | marha <marha@users.sourceforge.net> | 2012-03-26 14:23:28 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-03-26 14:23:28 +0200 |
commit | 76bcc36ed305418a3ddc5752d287ede894243e1b (patch) | |
tree | bacb320c825768471ce56f058f17ce863d592376 /xorg-server/hw/dmx/config/dmxcompat.c | |
parent | 7d894e32566b710952c44cbc71939ad1d9e2fa8d (diff) | |
parent | 0f834b91a4768673833ab4917e87d86c237bb1a6 (diff) | |
download | vcxsrv-76bcc36ed305418a3ddc5752d287ede894243e1b.tar.gz vcxsrv-76bcc36ed305418a3ddc5752d287ede894243e1b.tar.bz2 vcxsrv-76bcc36ed305418a3ddc5752d287ede894243e1b.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
xorg-server/Xext/shm.c
xorg-server/Xext/syncsrv.h
xorg-server/Xext/xvmain.c
xorg-server/Xi/exevents.c
xorg-server/Xi/opendev.c
xorg-server/composite/compalloc.c
xorg-server/composite/compoverlay.c
xorg-server/dix/colormap.c
xorg-server/dix/devices.c
xorg-server/dix/dispatch.c
xorg-server/dix/dixfonts.c
xorg-server/dix/eventconvert.c
xorg-server/dix/events.c
xorg-server/dix/gc.c
xorg-server/dix/getevents.c
xorg-server/dix/main.c
xorg-server/dix/privates.c
xorg-server/dix/registry.c
xorg-server/dix/resource.c
xorg-server/exa/exa_accel.c
xorg-server/exa/exa_migration_classic.c
xorg-server/exa/exa_unaccel.c
xorg-server/fb/fb.h
xorg-server/fb/fbcopy.c
xorg-server/fb/fbpixmap.c
xorg-server/glx/dispatch.h
xorg-server/glx/glapi.h
xorg-server/glx/glapi_gentable.c
xorg-server/glx/glapitable.h
xorg-server/glx/glprocs.h
xorg-server/glx/glxcmds.c
xorg-server/glx/glxcmdsswap.c
xorg-server/glx/glxdricommon.c
xorg-server/glx/glxdriswrast.c
xorg-server/glx/glxext.c
xorg-server/glx/indirect_dispatch.c
xorg-server/glx/indirect_dispatch.h
xorg-server/glx/indirect_dispatch_swap.c
xorg-server/glx/indirect_size.h
xorg-server/glx/indirect_size_get.h
xorg-server/glx/indirect_table.c
xorg-server/glx/indirect_util.c
xorg-server/glx/rensize.c
xorg-server/glx/single2swap.c
xorg-server/glx/singlepix.c
xorg-server/glx/singlepixswap.c
xorg-server/glx/singlesize.c
xorg-server/hw/dmx/dmxinit.c
xorg-server/hw/kdrive/ephyr/ephyr.c
xorg-server/hw/kdrive/ephyr/hostx.c
xorg-server/hw/kdrive/ephyr/hostx.h
xorg-server/hw/kdrive/src/kinput.c
xorg-server/hw/xfree86/common/compiler.h
xorg-server/hw/xwin/InitInput.c
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/ddraw.h
xorg-server/hw/xwin/glx/glwrap.c
xorg-server/hw/xwin/glx/indirect.c
xorg-server/hw/xwin/glx/wgl_ext_api.h
xorg-server/hw/xwin/glx/winpriv.c
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winallpriv.c
xorg-server/hw/xwin/winauth.c
xorg-server/hw/xwin/winclipboard.h
xorg-server/hw/xwin/winclipboardinit.c
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winclipboardunicode.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winclipboardxevents.c
xorg-server/hw/xwin/wincmap.c
xorg-server/hw/xwin/winconfig.c
xorg-server/hw/xwin/wincreatewnd.c
xorg-server/hw/xwin/wincursor.c
xorg-server/hw/xwin/windialogs.c
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winerror.c
xorg-server/hw/xwin/wingc.c
xorg-server/hw/xwin/wingetsp.c
xorg-server/hw/xwin/winkeybd.c
xorg-server/hw/xwin/winkeybd.h
xorg-server/hw/xwin/winlayouts.h
xorg-server/hw/xwin/winmisc.c
xorg-server/hw/xwin/winmonitors.c
xorg-server/hw/xwin/winmouse.c
xorg-server/hw/xwin/winmsg.c
xorg-server/hw/xwin/winmsg.h
xorg-server/hw/xwin/winmultiwindowclass.c
xorg-server/hw/xwin/winmultiwindowicons.c
xorg-server/hw/xwin/winmultiwindowshape.c
xorg-server/hw/xwin/winmultiwindowwindow.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
xorg-server/hw/xwin/winnativegdi.c
xorg-server/hw/xwin/winpfbdd.c
xorg-server/hw/xwin/winpixmap.c
xorg-server/hw/xwin/winpolyline.c
xorg-server/hw/xwin/winprefs.c
xorg-server/hw/xwin/winprocarg.c
xorg-server/hw/xwin/winregistry.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winsetsp.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/hw/xwin/winshadddnl.c
xorg-server/hw/xwin/winshadgdi.c
xorg-server/hw/xwin/wintrayicon.c
xorg-server/hw/xwin/winwin32rootless.c
xorg-server/hw/xwin/winwin32rootlesswindow.c
xorg-server/hw/xwin/winwin32rootlesswndproc.c
xorg-server/hw/xwin/winwindow.c
xorg-server/hw/xwin/winwindow.h
xorg-server/hw/xwin/winwindowswm.c
xorg-server/hw/xwin/winwndproc.c
xorg-server/include/callback.h
xorg-server/include/dixstruct.h
xorg-server/include/misc.h
xorg-server/include/os.h
xorg-server/include/scrnintstr.h
xorg-server/mi/micmap.c
xorg-server/mi/miinitext.c
xorg-server/mi/mioverlay.c
xorg-server/mi/misprite.c
xorg-server/mi/mivaltree.c
xorg-server/mi/miwindow.c
xorg-server/miext/damage/damage.c
xorg-server/miext/rootless/rootlessGC.c
xorg-server/miext/rootless/rootlessWindow.c
xorg-server/os/WaitFor.c
xorg-server/os/access.c
xorg-server/os/connection.c
xorg-server/os/io.c
xorg-server/os/log.c
xorg-server/os/osinit.c
xorg-server/os/utils.c
xorg-server/os/xdmcp.c
xorg-server/os/xprintf.c
xorg-server/os/xstrans.c
xorg-server/render/mipict.c
xorg-server/xkb/xkbActions.c
xorg-server/xkb/xkbInit.c
xorg-server/xkeyboard-config/compat/default.in
Diffstat (limited to 'xorg-server/hw/dmx/config/dmxcompat.c')
-rw-r--r-- | xorg-server/hw/dmx/config/dmxcompat.c | 160 |
1 files changed, 78 insertions, 82 deletions
diff --git a/xorg-server/hw/dmx/config/dmxcompat.c b/xorg-server/hw/dmx/config/dmxcompat.c index 1c72084fa..bd9f12738 100644 --- a/xorg-server/hw/dmx/config/dmxcompat.c +++ b/xorg-server/hw/dmx/config/dmxcompat.c @@ -52,80 +52,84 @@ #include <string.h> #include <ctype.h> -static int dmxVDLReadLine(FILE *str, char *buf, int len) +static int +dmxVDLReadLine(FILE * str, char *buf, int len) { - if (fgets(buf, len, str)) return strlen(buf); + if (fgets(buf, len, str)) + return strlen(buf); return 0; } -static int dmxVDLCount(const char *buf) +static int +dmxVDLCount(const char *buf) { return strtol(buf, NULL, 10); } -static void dmxVDLVirtualEntry(const char *buf, - char *name, int *len, - int *x, int *y) +static void +dmxVDLVirtualEntry(const char *buf, char *name, int *len, int *x, int *y) { - char *end; + char *end; const char *s; - char *d; - int start; - + char *d; + int start; + *x = strtol(buf, &end, 10); *y = strtol(end, &end, 10); for (s = end, d = name, start = 1; *s && *s != '['; ++s) { - if (start && isspace(*s)) continue; - *d++ = *s; + if (start && isspace(*s)) + continue; + *d++ = *s; start = 0; } *d = '\0'; - while (d > name && isspace(d[-1])) *--d = '\0'; /* remove trailing space */ + while (d > name && isspace(d[-1])) + *--d = '\0'; /* remove trailing space */ *len = strlen(name); } -static void dmxVDLDisplayEntry(const char *buf, - char *name, int *len, - int *x, int *y, - int *xoff, int *yoff, - int *xorig, int *yorig) +static void +dmxVDLDisplayEntry(const char *buf, + char *name, int *len, + int *x, int *y, int *xoff, int *yoff, int *xorig, int *yorig) { const char *pt; - char *end; - - pt = strchr(buf, ' '); - strlcpy(name, buf, 1+pt-buf); - *len = strlen(name); - - *x = strtol(pt, &end, 10); - *y = strtol(end, &end, 10); + char *end; + + pt = strchr(buf, ' '); + strlcpy(name, buf, 1 + pt - buf); + *len = strlen(name); + + *x = strtol(pt, &end, 10); + *y = strtol(end, &end, 10); *xorig = strtol(end, &end, 10); *yorig = strtol(end, &end, 10); - *xoff = strtol(end, &end, 10); - *yoff = strtol(end, NULL, 10); + *xoff = strtol(end, &end, 10); + *yoff = strtol(end, NULL, 10); } /** Read from the VDL format \a filename and return a newly allocated \a * DMXConfigEntryPtr */ -DMXConfigEntryPtr dmxVDLRead(const char *filename) +DMXConfigEntryPtr +dmxVDLRead(const char *filename) { - FILE *str; - char buf[2048]; /* RATS: Use ok */ - char *pt; - int lineno = 0; - DMXConfigEntryPtr entry = NULL; + FILE *str; + char buf[2048]; /* RATS: Use ok */ + char *pt; + int lineno = 0; + DMXConfigEntryPtr entry = NULL; DMXConfigVirtualPtr virtual = NULL; - DMXConfigSubPtr sub = NULL; + DMXConfigSubPtr sub = NULL; DMXConfigDisplayPtr display = NULL; - DMXConfigFullDimPtr fdim = NULL; - int vcount = 0; - int dcount = 0; - int icount = 0; - int x, y, xoff, yoff, xorig, yorig; - char name[2048]; /* RATS: Use ok */ - const char *tmp; - int len; + DMXConfigFullDimPtr fdim = NULL; + int vcount = 0; + int dcount = 0; + int icount = 0; + int x, y, xoff, yoff, xorig, yorig; + char name[2048]; /* RATS: Use ok */ + const char *tmp; + int len; enum { simulateFlag, virtualCount, @@ -134,15 +138,18 @@ DMXConfigEntryPtr dmxVDLRead(const char *filename) displayEntry, ignoreCount, ignoreEntry - } state = simulateFlag; + } state = simulateFlag; - if (!filename) str = stdin; - else str = fopen(filename, "r"); - if (!str) return NULL; + if (!filename) + str = stdin; + else + str = fopen(filename, "r"); + if (!str) + return NULL; while (dmxVDLReadLine(str, buf, sizeof(buf))) { DMXConfigCommentPtr comment = NULL; - + ++lineno; for (pt = buf; *pt; pt++) if (*pt == '\r' || *pt == '\n') { @@ -166,7 +173,7 @@ DMXConfigEntryPtr dmxVDLRead(const char *filename) case virtualEntry: len = sizeof(name); dmxVDLVirtualEntry(buf, name, &len, &x, &y); - tmp = dmxConfigCopyString(name, len); + tmp = dmxConfigCopyString(name, len); virtual = dmxConfigCreateVirtual(NULL, dmxConfigCreateString(T_STRING, lineno, @@ -186,41 +193,29 @@ DMXConfigEntryPtr dmxVDLRead(const char *filename) case displayEntry: dmxVDLDisplayEntry(buf, name, &len, &x, &y, &xoff, &yoff, &xorig, &yorig); - tmp = dmxConfigCopyString(name, len); - fdim = dmxConfigCreateFullDim( - dmxConfigCreatePartDim( - dmxConfigCreatePair(T_DIMENSION, - lineno, - NULL, - x, y, 0, 0), - dmxConfigCreatePair(T_OFFSET, - lineno, - NULL, - xoff, yoff, - xoff, yoff)), - NULL); - display = dmxConfigCreateDisplay(NULL, - dmxConfigCreateString(T_STRING, - lineno, - NULL, - tmp), - fdim, - dmxConfigCreatePair(T_ORIGIN, - lineno, - NULL, - xorig, yorig, - 0, 0), - NULL); + tmp = dmxConfigCopyString(name, len); + fdim = + dmxConfigCreateFullDim(dmxConfigCreatePartDim + (dmxConfigCreatePair + (T_DIMENSION, lineno, NULL, x, y, 0, 0), + dmxConfigCreatePair(T_OFFSET, lineno, + NULL, xoff, yoff, + xoff, yoff)), NULL); + display = + dmxConfigCreateDisplay(NULL, + dmxConfigCreateString(T_STRING, lineno, + NULL, tmp), fdim, + dmxConfigCreatePair(T_ORIGIN, lineno, + NULL, xorig, yorig, + 0, 0), NULL); sub = dmxConfigAddSub(sub, dmxConfigSubDisplay(display)); if (!--dcount) { - state = ignoreCount; + state = ignoreCount; virtual->subentry = sub; - entry = dmxConfigAddEntry(entry, - dmxConfigVirtual, - NULL, - virtual); - virtual = NULL; - sub = NULL; + entry = dmxConfigAddEntry(entry, + dmxConfigVirtual, NULL, virtual); + virtual = NULL; + sub = NULL; } break; case ignoreCount: @@ -228,7 +223,8 @@ DMXConfigEntryPtr dmxVDLRead(const char *filename) state = ignoreEntry; break; case ignoreEntry: - if (!--icount) state = virtualEntry; + if (!--icount) + state = virtualEntry; break; } } |