Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/xorg-server merge xorg-server 1.20.3.
details: https://anonhg.NetBSD.org/xsrc/rev/65560bab895f
branches: trunk
changeset: 10054:65560bab895f
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Dec 31 09:49:58 2018 +0000
description:
merge xorg-server 1.20.3.
diffstat:
external/mit/xorg-server/dist/TODO | 92 -
external/mit/xorg-server/dist/Xext/dpms.c | 124 +-
external/mit/xorg-server/dist/Xext/dpmsstubs.c | 47 -
external/mit/xorg-server/dist/Xext/panoramiX.c | 9 +-
external/mit/xorg-server/dist/Xext/saver.c | 37 +-
external/mit/xorg-server/dist/Xext/security.c | 12 +-
external/mit/xorg-server/dist/Xext/shape.c | 23 +-
external/mit/xorg-server/dist/Xext/shm.c | 93 +-
external/mit/xorg-server/dist/Xext/sync.c | 427 +-
external/mit/xorg-server/dist/Xext/vidmode.c | 46 +-
external/mit/xorg-server/dist/Xext/xace.c | 45 +-
external/mit/xorg-server/dist/Xext/xcmisc.c | 8 +-
external/mit/xorg-server/dist/Xext/xres.c | 142 +-
external/mit/xorg-server/dist/Xext/xtest.c | 12 +-
external/mit/xorg-server/dist/Xext/xvdisp.c | 45 +-
external/mit/xorg-server/dist/Xi/chgdctl.c | 4 +-
external/mit/xorg-server/dist/Xi/chgfctl.c | 2 +-
external/mit/xorg-server/dist/Xi/sendexev.c | 2 +-
external/mit/xorg-server/dist/Xi/xiallowev.c | 2 +-
external/mit/xorg-server/dist/Xi/xibarriers.c | 2 +-
external/mit/xorg-server/dist/Xi/xichangecursor.c | 2 +-
external/mit/xorg-server/dist/Xi/xichangehierarchy.c | 12 +-
external/mit/xorg-server/dist/Xi/xigetclientpointer.c | 4 +-
external/mit/xorg-server/dist/Xi/xigrabdev.c | 6 +-
external/mit/xorg-server/dist/Xi/xipassivegrab.c | 10 +-
external/mit/xorg-server/dist/Xi/xiproperty.c | 38 +-
external/mit/xorg-server/dist/Xi/xiquerydevice.c | 31 +-
external/mit/xorg-server/dist/Xi/xiquerypointer.c | 6 +-
external/mit/xorg-server/dist/Xi/xiselectev.c | 4 +-
external/mit/xorg-server/dist/Xi/xisetclientpointer.c | 2 +-
external/mit/xorg-server/dist/Xi/xisetdevfocus.c | 4 +-
external/mit/xorg-server/dist/Xi/xiwarppointer.c | 6 +-
external/mit/xorg-server/dist/config/wscons.c | 2 +-
external/mit/xorg-server/dist/configure | 2189 +++++---
external/mit/xorg-server/dist/configure.ac | 455 +-
external/mit/xorg-server/dist/dbe/dbe.c | 14 +-
external/mit/xorg-server/dist/dix/devices.c | 92 +-
external/mit/xorg-server/dist/dix/dispatch.c | 240 +-
external/mit/xorg-server/dist/dix/dixfonts.c | 331 +-
external/mit/xorg-server/dist/dix/enterleave.c | 2 +-
external/mit/xorg-server/dist/dix/events.c | 19 +-
external/mit/xorg-server/dist/dix/ffs.c | 49 -
external/mit/xorg-server/dist/dix/getevents.c | 34 +-
external/mit/xorg-server/dist/dix/globals.c | 10 -
external/mit/xorg-server/dist/dix/swapreq.c | 136 +-
external/mit/xorg-server/dist/dix/window.c | 4 +-
external/mit/xorg-server/dist/exa/exa_priv.h | 2 +-
external/mit/xorg-server/dist/exa/exa_render.c | 5 +-
external/mit/xorg-server/dist/fb/fb24_32.c | 548 --
external/mit/xorg-server/dist/fb/fb24_32.h | 44 -
external/mit/xorg-server/dist/glx/glxcmds.c | 494 +-
external/mit/xorg-server/dist/glx/glxcmdsswap.c | 204 +-
external/mit/xorg-server/dist/glx/glxdrawable.h | 3 +
external/mit/xorg-server/dist/glx/glxext.c | 470 +-
external/mit/xorg-server/dist/glx/glxserver.h | 79 +-
external/mit/xorg-server/dist/glx/indirect_program.c | 7 +-
external/mit/xorg-server/dist/glx/indirect_texture_compression.c | 6 +-
external/mit/xorg-server/dist/glx/indirect_util.c | 32 +-
external/mit/xorg-server/dist/glx/single2.c | 8 +-
external/mit/xorg-server/dist/glx/single2swap.c | 5 +-
external/mit/xorg-server/dist/glx/singlepix.c | 27 +-
external/mit/xorg-server/dist/glx/singlepixswap.c | 27 +-
external/mit/xorg-server/dist/glx/unpack.h | 42 +-
external/mit/xorg-server/dist/hw/dmx/input/dmxsigio.c | 234 -
external/mit/xorg-server/dist/hw/dmx/input/dmxsigio.h | 43 -
external/mit/xorg-server/dist/hw/dmx/input/lnx-keyboard.c | 1194 ----
external/mit/xorg-server/dist/hw/dmx/input/lnx-keyboard.h | 63 -
external/mit/xorg-server/dist/hw/dmx/input/lnx-ms.c | 348 -
external/mit/xorg-server/dist/hw/dmx/input/lnx-ms.h | 55 -
external/mit/xorg-server/dist/hw/dmx/input/lnx-ps2.c | 318 -
external/mit/xorg-server/dist/hw/dmx/input/lnx-ps2.h | 55 -
external/mit/xorg-server/dist/hw/kdrive/ephyr/ephyrdri.c | 356 -
external/mit/xorg-server/dist/hw/kdrive/ephyr/ephyrdri.h | 70 -
external/mit/xorg-server/dist/hw/kdrive/ephyr/ephyrdriext.c | 1376 -----
external/mit/xorg-server/dist/hw/kdrive/ephyr/ephyrdriext.h | 40 -
external/mit/xorg-server/dist/hw/kdrive/ephyr/ephyrglxext.c | 854 ---
external/mit/xorg-server/dist/hw/kdrive/ephyr/ephyrglxext.h | 34 -
external/mit/xorg-server/dist/hw/kdrive/ephyr/ephyrhostglx.c | 490 --
external/mit/xorg-server/dist/hw/kdrive/ephyr/ephyrhostglx.h | 75 -
external/mit/xorg-server/dist/hw/kdrive/ephyr/os.c | 49 -
external/mit/xorg-server/dist/hw/kdrive/fake/Makefile.am | 31 -
external/mit/xorg-server/dist/hw/kdrive/fake/Makefile.in | 917 ---
external/mit/xorg-server/dist/hw/kdrive/fake/fake.c | 444 -
external/mit/xorg-server/dist/hw/kdrive/fake/fake.h | 131 -
external/mit/xorg-server/dist/hw/kdrive/fake/fakeinit.c | 119 -
external/mit/xorg-server/dist/hw/kdrive/fake/kbd.c | 75 -
external/mit/xorg-server/dist/hw/kdrive/fake/mouse.c | 65 -
external/mit/xorg-server/dist/hw/kdrive/fake/os.c | 62 -
external/mit/xorg-server/dist/hw/kdrive/fbdev/Makefile.am | 30 -
external/mit/xorg-server/dist/hw/kdrive/fbdev/Makefile.in | 912 ---
external/mit/xorg-server/dist/hw/kdrive/fbdev/fbdev.c | 892 ---
external/mit/xorg-server/dist/hw/kdrive/fbdev/fbdev.h | 99 -
external/mit/xorg-server/dist/hw/kdrive/fbdev/fbinit.c | 105 -
external/mit/xorg-server/dist/hw/kdrive/linux/Makefile.am | 27 -
external/mit/xorg-server/dist/hw/kdrive/linux/Makefile.in | 844 ---
external/mit/xorg-server/dist/hw/kdrive/linux/evdev.c | 524 --
external/mit/xorg-server/dist/hw/kdrive/linux/keyboard.c | 341 -
external/mit/xorg-server/dist/hw/kdrive/linux/linux.c | 375 -
external/mit/xorg-server/dist/hw/kdrive/linux/mouse.c | 998 ----
external/mit/xorg-server/dist/hw/kdrive/linux/ms.c | 178 -
external/mit/xorg-server/dist/hw/kdrive/linux/ps2.c | 180 -
external/mit/xorg-server/dist/hw/kdrive/linux/tslib.c | 195 -
external/mit/xorg-server/dist/hw/kdrive/src/kmode.c | 378 -
external/mit/xorg-server/dist/hw/xfree86/common/compiler.h | 81 +-
external/mit/xorg-server/dist/hw/xfree86/common/xf86.h | 33 +-
external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c | 148 +-
external/mit/xorg-server/dist/hw/xfree86/common/xf86Bus.c | 78 +-
external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c | 183 +-
external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c | 112 +-
external/mit/xorg-server/dist/hw/xfree86/common/xf86DGA.c | 2 +-
external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c | 227 +-
external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c | 90 +-
external/mit/xorg-server/dist/hw/xfree86/common/xf86str.h | 64 +-
external/mit/xorg-server/dist/hw/xfree86/dixmods/xkbKillSrv.c | 54 -
external/mit/xorg-server/dist/hw/xfree86/dixmods/xkbPrivate.c | 53 -
external/mit/xorg-server/dist/hw/xfree86/dixmods/xkbVT.c | 64 -
external/mit/xorg-server/dist/hw/xfree86/doc/README.DRIcomp | 551 --
external/mit/xorg-server/dist/hw/xfree86/dri/xf86dri.c | 13 +-
external/mit/xorg-server/dist/hw/xfree86/dri2/dri2.c | 64 +-
external/mit/xorg-server/dist/hw/xfree86/dri2/dri2ext.c | 4 +-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c | 684 ++-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.h | 59 +-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c | 2428 ++++++++-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c | 401 +-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/sh3224.c | 140 -
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/sh3224.h | 7 -
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c | 275 +-
external/mit/xorg-server/dist/hw/xfree86/fbdevhw/fbdevhw.c | 22 +-
external/mit/xorg-server/dist/hw/xfree86/fbdevhw/man/fbdevhw.man | 10 +-
external/mit/xorg-server/dist/hw/xfree86/loader/loader.c | 56 +-
external/mit/xorg-server/dist/hw/xfree86/loader/os.c | 72 -
external/mit/xorg-server/dist/hw/xfree86/modes/xf86Cursors.c | 209 +-
external/mit/xorg-server/dist/hw/xfree86/modes/xf86RandR12.c | 569 +-
external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_ev56.c | 74 -
external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c | 4 +-
external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Pci.h | 4 +-
external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c | 6 +-
external/mit/xorg-server/dist/hw/xfree86/os-support/bus/xf86Sbus.h | 2 +-
external/mit/xorg-server/dist/hw/xfree86/os-support/linux/lnx_ev56.c | 59 -
external/mit/xorg-server/dist/hw/xfree86/parser/Device.c | 7 +-
external/mit/xorg-server/dist/hw/xfree86/parser/xf86Parser.h | 6 +-
external/mit/xorg-server/dist/hw/xfree86/ramdac/xf86Cursor.c | 506 --
external/mit/xorg-server/dist/hw/xfree86/shadowfb/shadow.c | 171 -
external/mit/xorg-server/dist/hw/xfree86/vbe/vbe.c | 2 +-
external/mit/xorg-server/dist/hw/xwin/winauth.c | 61 +-
external/mit/xorg-server/dist/hw/xwin/winvideo.c | 191 -
external/mit/xorg-server/dist/include/dix-config.h.in | 68 +-
external/mit/xorg-server/dist/include/dix.h | 39 +-
external/mit/xorg-server/dist/include/dixfont.h | 18 +-
external/mit/xorg-server/dist/include/dixfontstubs.h | 43 -
external/mit/xorg-server/dist/include/kdrive-config.h.in | 37 -
external/mit/xorg-server/dist/include/list.h | 3 +-
external/mit/xorg-server/dist/include/os.h | 56 +-
external/mit/xorg-server/dist/mi/miarc.c | 440 +-
external/mit/xorg-server/dist/mi/miinitext.c | 214 +-
external/mit/xorg-server/dist/miext/shadow/shalloc.c | 49 -
external/mit/xorg-server/dist/os/WaitFor.c | 453 +-
external/mit/xorg-server/dist/os/access.c | 31 +-
external/mit/xorg-server/dist/os/auth.c | 9 +-
external/mit/xorg-server/dist/os/connection.c | 669 +-
external/mit/xorg-server/dist/os/io.c | 217 +-
external/mit/xorg-server/dist/os/mitauth.c | 4 -
external/mit/xorg-server/dist/os/osdep.h | 92 +-
external/mit/xorg-server/dist/os/rpcauth.c | 2 +-
external/mit/xorg-server/dist/os/utils.c | 249 +-
external/mit/xorg-server/dist/os/xdmauth.c | 2 +-
external/mit/xorg-server/dist/randr/randr.c | 97 +-
external/mit/xorg-server/dist/randr/randrstr.h | 103 +-
external/mit/xorg-server/dist/randr/rrsdispatch.c | 124 +-
external/mit/xorg-server/dist/render/glyph.c | 2 +-
external/mit/xorg-server/dist/render/render.c | 91 +-
external/mit/xorg-server/dist/test/Makefile.am | 247 +-
external/mit/xorg-server/dist/test/ddxstubs.c | 113 -
external/mit/xorg-server/dist/test/os.c | 166 -
external/mit/xorg-server/dist/test/xi1/Makefile.am | 34 -
external/mit/xorg-server/dist/test/xi1/Makefile.in | 1256 -----
external/mit/xorg-server/dist/test/xi2/Makefile.am | 70 -
external/mit/xorg-server/dist/test/xi2/Makefile.in | 1518 ------
external/mit/xorg-server/dist/test/xi2/protocol-xigetclientpointer.c | 21 +-
external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c | 24 +-
external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c | 22 +-
external/mit/xorg-server/dist/test/xkb.c | 174 -
external/mit/xorg-server/dist/xfixes/cursor.c | 60 +-
external/mit/xorg-server/dist/xfixes/region.c | 34 +-
external/mit/xorg-server/dist/xfixes/saveset.c | 2 +-
external/mit/xorg-server/dist/xfixes/select.c | 5 +-
external/mit/xorg-server/dist/xfixes/xfixes.c | 29 +-
external/mit/xorg-server/dist/xkb/xkb.c | 39 +-
external/mit/xorg-server/include/dix-config.h | 95 +-
external/mit/xorg-server/include/version-config.h | 6 +-
external/mit/xorg-server/include/xkb-config.h | 4 +-
external/mit/xorg-server/include/xorg-config.h | 23 +-
external/mit/xorg-server/include/xorg-server.h | 33 +-
193 files changed, 8752 insertions(+), 26636 deletions(-)
diffs (truncated from 48599 to 300 lines):
diff -r f93493a26fb3 -r 65560bab895f external/mit/xorg-server/dist/TODO
--- a/external/mit/xorg-server/dist/TODO Mon Dec 31 09:36:04 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-tree inheritance:
-
-init-cleanup
-
-driver todo for megamerge:
-nuke ddc1 paths
-nuke weak functions
-i810 kms
-mach64 LinearVidMem removal
-openbsd pciaccess fd inversion
-fix linux int10 ReadBIOS and/or merge int10 and generic
-geode/sis/xgi *apVidMem removal
-i128/mga BiosBase removal
-sis virtualFrom removal
-mach64/rendition max[HV]Value removal
-cirrus should prefer 16bpp
-external RAMDAC code motion for glint/s3/tga
-freedreno oslib.h detangle
-
-unify xinerama protocol ~-1kloc
-- add screen id token
-- add removal api
-- add primary flag dealie?
-
-fold up pre-1.2 randr
-s/xf86DefaultModes/DMTModes/ -100
-GLX for Xnest (works-ish on other branch)
-rootless-merge merge
-rootless-using xwayland
-glxproxy something something, -15kloc if you can delete it...
-maybe merge int10/vbe
-fix shadow for multiple pixmaps
-top-level loader (almost, ported api, needs motion)
-loadable glx for all ddxes
-un-special-case colormap privates
-redo fbbits a la sna
-merge the one snafb bugfix
-render: FindGlyph -> FindGlyphs
-miValidateTree: 'forward' might be a pessimization
-RegionOp's overlapFunc is constant
-detach dmx from fb
-destroywindow should return void
-redo de-sdking of opaque.h
-
-PRIVATE_COLORMAP
-only reason this is special is xf86HandleColormaps, which the ddx drivers
-call _after_ creating default colormap, but which registers a devprivate.
-should find some symbol always called before xf86HC but never called in
-randr 1.2 drivers? xf86ValidateModes perhaps?
-
-XRT Must Die
-Class: Drawable
-Types: Colormap, Damage, GC, Picture, Pixmap, Window
-
-colormaps:
-CreateColormap has a special case for the default cmap
-uninstall is skipped for server cmaps? because default?
-WindowOptRec->colormap is an id not a pointer
-ScreenRec->defColormap is an id not a pointer, but, okay?
-CopyColormapAndFree is... odd.
-AllocColor's CMAPENTRY special case should be moved
-ListInstalledColormaps is godawful
-not clear why vfb/nest duplicate micmap so much
-
-pixmap/window:
-aaaaaaaaaa
-
----
-
-FakeClientID(0):
-weird lifetimes:
- screensaver window
- applewm/winwm event resource
-visuals should use separate allocator (fbconfigs too?)
-GetNewFontClientID?
-hmm: xwin GenerateAuthorization, auth .Add
-
-FakeClientID(client->index):
- dri2 add_frame_event hurrr
- DRI2CreateDrawable2
-
----
-
-dmx wraps render, fuck.
-
-Create/Free GlyphSet: Annoying because GlyphSets are display-wide, so there's
-no obvious place to add a wrap chain. Likewise Add/FreeGlyphs, although there
-the problem is that glyphs embed their own per-screen list! Fuck sake.
-
-RenderCompositeGlyphs is correspondingly weird.
-
-Not entirely sure why SetPictureTransform/Filter are wrapped.
diff -r f93493a26fb3 -r 65560bab895f external/mit/xorg-server/dist/Xext/dpms.c
--- a/external/mit/xorg-server/dist/Xext/dpms.c Mon Dec 31 09:36:04 2018 +0000
+++ b/external/mit/xorg-server/dist/Xext/dpms.c Mon Dec 31 09:49:58 2018 +0000
@@ -40,6 +40,77 @@
#include <X11/extensions/dpmsproto.h>
#include "dpmsproc.h"
#include "extinit.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+
+CARD16 DPMSPowerLevel = 0;
+Bool DPMSDisabledSwitch = FALSE;
+CARD32 DPMSStandbyTime = -1;
+CARD32 DPMSSuspendTime = -1;
+CARD32 DPMSOffTime = -1;
+Bool DPMSEnabled;
+
+Bool
+DPMSSupported(void)
+{
+ int i;
+
+ /* For each screen, check if DPMS is supported */
+ for (i = 0; i < screenInfo.numScreens; i++)
+ if (screenInfo.screens[i]->DPMS != NULL)
+ return TRUE;
+
+ for (i = 0; i < screenInfo.numGPUScreens; i++)
+ if (screenInfo.gpuscreens[i]->DPMS != NULL)
+ return TRUE;
+
+ return FALSE;
+}
+
+static Bool
+isUnblank(int mode)
+{
+ switch (mode) {
+ case SCREEN_SAVER_OFF:
+ case SCREEN_SAVER_FORCER:
+ return TRUE;
+ case SCREEN_SAVER_ON:
+ case SCREEN_SAVER_CYCLE:
+ return FALSE;
+ default:
+ return TRUE;
+ }
+}
+
+int
+DPMSSet(ClientPtr client, int level)
+{
+ int rc, i;
+
+ DPMSPowerLevel = level;
+
+ if (level != DPMSModeOn) {
+ if (isUnblank(screenIsSaved)) {
+ rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive);
+ if (rc != Success)
+ return rc;
+ }
+ } else if (!isUnblank(screenIsSaved)) {
+ rc = dixSaveScreens(client, SCREEN_SAVER_OFF, ScreenSaverReset);
+ if (rc != Success)
+ return rc;
+ }
+
+ for (i = 0; i < screenInfo.numScreens; i++)
+ if (screenInfo.screens[i]->DPMS != NULL)
+ screenInfo.screens[i]->DPMS(screenInfo.screens[i], level);
+
+ for (i = 0; i < screenInfo.numGPUScreens; i++)
+ if (screenInfo.gpuscreens[i]->DPMS != NULL)
+ screenInfo.gpuscreens[i]->DPMS(screenInfo.gpuscreens[i], level);
+
+ return Success;
+}
static int
ProcDPMSGetVersion(ClientPtr client)
@@ -72,7 +143,7 @@
.type = X_Reply,
.sequenceNumber = client->sequence,
.length = 0,
- .capable = DPMSCapableFlag
+ .capable = TRUE
};
REQUEST_SIZE_MATCH(xDPMSCapableReq);
@@ -140,11 +211,9 @@
REQUEST_SIZE_MATCH(xDPMSEnableReq);
- if (DPMSCapableFlag) {
- DPMSEnabled = TRUE;
- if (!was_enabled)
- SetScreenSaverTimer();
- }
+ DPMSEnabled = TRUE;
+ if (!was_enabled)
+ SetScreenSaverTimer();
return Success;
}
@@ -234,7 +303,7 @@
}
}
-static int
+static int _X_COLD
SProcDPMSGetVersion(ClientPtr client)
{
REQUEST(xDPMSGetVersionReq);
@@ -246,7 +315,7 @@
return ProcDPMSGetVersion(client);
}
-static int
+static int _X_COLD
SProcDPMSCapable(ClientPtr client)
{
REQUEST(xDPMSCapableReq);
@@ -257,7 +326,7 @@
return ProcDPMSCapable(client);
}
-static int
+static int _X_COLD
SProcDPMSGetTimeouts(ClientPtr client)
{
REQUEST(xDPMSGetTimeoutsReq);
@@ -268,7 +337,7 @@
return ProcDPMSGetTimeouts(client);
}
-static int
+static int _X_COLD
SProcDPMSSetTimeouts(ClientPtr client)
{
REQUEST(xDPMSSetTimeoutsReq);
@@ -282,7 +351,7 @@
return ProcDPMSSetTimeouts(client);
}
-static int
+static int _X_COLD
SProcDPMSEnable(ClientPtr client)
{
REQUEST(xDPMSEnableReq);
@@ -293,7 +362,7 @@
return ProcDPMSEnable(client);
}
-static int
+static int _X_COLD
SProcDPMSDisable(ClientPtr client)
{
REQUEST(xDPMSDisableReq);
@@ -304,7 +373,7 @@
return ProcDPMSDisable(client);
}
-static int
+static int _X_COLD
SProcDPMSForceLevel(ClientPtr client)
{
REQUEST(xDPMSForceLevelReq);
@@ -317,7 +386,7 @@
return ProcDPMSForceLevel(client);
}
-static int
+static int _X_COLD
SProcDPMSInfo(ClientPtr client)
{
REQUEST(xDPMSInfoReq);
@@ -328,7 +397,7 @@
return ProcDPMSInfo(client);
}
-static int
+static int _X_COLD
SProcDPMSDispatch(ClientPtr client)
{
REQUEST(xReq);
@@ -354,10 +423,29 @@
}
}
+static void
+DPMSCloseDownExtension(ExtensionEntry *e)
+{
+ DPMSSet(serverClient, DPMSModeOn);
+}
+
void
DPMSExtensionInit(void)
{
- AddExtension(DPMSExtensionName, 0, 0,
- ProcDPMSDispatch, SProcDPMSDispatch,
- NULL, StandardMinorOpcode);
+#define CONDITIONALLY_SET_DPMS_TIMEOUT(_timeout_value_) \
+ if (_timeout_value_ == -1) { /* not yet set from config */ \
Home |
Main Index |
Thread Index |
Old Index