173.08173.08

7 files changed, 648 insertions, 1 deletions

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..5b6e7c6
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/Makefile b/Makefile
index 84a5608..e4fa573 100644
--- a/Makefile
+++ b/Makefile
@@ -98,6 +98,7 @@ NVIDIA_XCONFIG_VERSION = 1.0
 NVIDIA_XCONFIG_DISTDIR = $(NVIDIA_XCONFIG)-$(NVIDIA_XCONFIG_VERSION)
 
 EXTRA_DIST = \
+	COPYING \
 	nvgetopt.h \
 	nvidia-xconfig.h \
 	nvidia-cfg.h \
diff --git a/make_usable.c b/make_usable.c
index 5617e4c..8c047d7 100644
--- a/make_usable.c
+++ b/make_usable.c
@@ -211,6 +211,40 @@ int update_extensions(Options *op, XConfigPtr config)
 } /* update_extensions() */
 
 
+/*
+ * update_server_flags() - update the server flags section with any
+ * server flag options; the only option so far is "HandleSpecialKeys"
+ */
+
+int update_server_flags(Options *op, XConfigPtr config)
+{
+    if (!op->handle_special_keys) return TRUE;
+
+    if (!config->flags) {
+        config->flags = nvalloc(sizeof(XConfigFlagsRec));
+        if ( !config->flags ) {
+            return FALSE;
+        }
+    }
+
+    if (config->flags->options) {
+        remove_option_from_list(&(config->flags->options),
+                                "HandleSpecialKeys");
+    }
+
+    if (op->handle_special_keys != NV_DISABLE_STRING_OPTION) {
+        config->flags->options =
+            xconfigAddNewOption(config->flags->options,
+                                "HandleSpecialKeys",
+                                op->handle_special_keys);
+    }
+
+    return TRUE;
+
+} /* update_server_flags() */
+
+
+
 
 /*
  * update_device() - update the device; there is a lot of information
diff --git a/nvidia-xconfig.c b/nvidia-xconfig.c
index e3208ad..dea1985 100644
--- a/nvidia-xconfig.c
+++ b/nvidia-xconfig.c
@@ -307,6 +307,45 @@ Options *parse_commandline(int argc, char *argv[])
 
         case FORCE_GENERATE_OPTION: op->force_generate = TRUE; break;
 
+        case ACPID_SOCKET_PATH_OPTION: 
+            if (disable) {
+                op->acpid_socket_path = NV_DISABLE_STRING_OPTION;
+            } else {
+                op->acpid_socket_path = strval; 
+            }
+            break;
+
+        case HANDLE_SPECIAL_KEYS_OPTION:
+            {
+                const char *valid_values[] = {
+                    "Always",
+                    "Never",
+                    "WhenNeeded",
+                    NULL,
+                };
+
+                int i;
+
+                if (disable) {
+                    op->handle_special_keys = NV_DISABLE_STRING_OPTION;
+                    break;
+                }
+
+                for (i = 0; valid_values[i]; i++) {
+                    if (!strcasecmp(strval, valid_values[i])) {
+                        break;
+                    }
+                }
+
+                if (valid_values[i]) {
+                    op->handle_special_keys = strval;
+                } else {
+                    fprintf(stderr, "Invalid HandleSpecialKeys option: %s.\n", strval);
+                    goto fail;
+                }
+                break;
+            }
+
         case NVAGP_OPTION:
 
             /* mark as disabled, so we can remove the option later */
@@ -1046,6 +1085,8 @@ int update_xconfig(Options *op, XConfigPtr config)
 
     update_modules(config);
 
+    update_server_flags(op, config);
+
     update_banner(config);
     
     return TRUE;
diff --git a/nvidia-xconfig.h b/nvidia-xconfig.h
index 40a77d8..d15c399 100644
--- a/nvidia-xconfig.h
+++ b/nvidia-xconfig.h
@@ -89,8 +89,11 @@ typedef struct {
 #define DYNAMIC_TWINVIEW_BOOL_OPTION            34
 #define INCLUDE_IMPLICIT_METAMODES_BOOL_OPTION  35
 #define USE_EVENTS_BOOL_OPTION                  36
+#define CONNECT_TO_ACPID_BOOL_OPTION            37
+#define ENABLE_ACPI_HOTKEYS_BOOL_OPTION         38
 
-#define XCONFIG_BOOL_OPTION_COUNT (USE_EVENTS_BOOL_OPTION + 1)
+
+#define XCONFIG_BOOL_OPTION_COUNT (ENABLE_ACPI_HOTKEYS_BOOL_OPTION + 1)
 
 /* # of 32-bit variables needed to hold all the boolean options (bits) */
 #define XCONFIG_BOOL_OPTION_SLOTS  \
@@ -161,6 +164,8 @@ typedef struct __options {
     char *custom_edid;
     char *tv_standard;
     char *tv_out_format;
+    char *acpid_socket_path;
+    char *handle_special_keys;
 
     double tv_over_scan;
 
@@ -238,6 +243,7 @@ int update_modules(XConfigPtr config);
 int update_screen(Options *op, XConfigPtr config, XConfigScreenPtr screen);
 XConfigLayoutPtr get_layout(Options *op, XConfigPtr config);
 int update_extensions(Options *op, XConfigPtr config);
+int update_server_flags(Options *op, XConfigPtr config);
 
 /* multiple_screens.c */
 
diff --git a/option_table.h b/option_table.h
index 6203f74..13588e1 100644
--- a/option_table.h
+++ b/option_table.h
@@ -42,6 +42,8 @@
 #define TV_OUT_FORMAT_OPTION                31
 #define TV_OVER_SCAN_OPTION                 32
 #define COOL_BITS_OPTION                    33
+#define ACPID_SOCKET_PATH_OPTION            34
+#define HANDLE_SPECIAL_KEYS_OPTION          35
 
 /*
  * To add a boolean option to nvidia-xconfig:
@@ -119,6 +121,13 @@ static const NVGetoptOption __options[] = {
 
     /* These options are only printed by "nvidia-xconfig --advanced-help" */
 
+    { "acpid-socket-path", 
+      ACPID_SOCKET_PATH_OPTION, 
+      NVGETOPT_STRING_ARGUMENT | NVGETOPT_ALLOW_DISABLE, NULL,
+      "Set this option to specify an alternate path to the Linux ACPI daemon "
+      "(acpid)'s socket, which the NVIDIA X driver will use to connect to "
+      "acpid." },
+
     { "add-argb-glx-visuals",
       XCONFIG_BOOL_VAL(ADD_ARGB_GLX_VISUALS_BOOL_OPTION),
       NVGETOPT_IS_BOOLEAN,  NULL,
@@ -154,6 +163,13 @@ static const NVGetoptOption __options[] = {
       XCONFIG_BOOL_VAL(COMPOSITE_BOOL_OPTION), NVGETOPT_IS_BOOLEAN, NULL,
       "Enable or disable the \"Composite\" X extension." },
 
+    { "connect-to-acpid",
+      XCONFIG_BOOL_VAL(CONNECT_TO_ACPID_BOOL_OPTION), NVGETOPT_IS_BOOLEAN, NULL,
+      "Enable or disable the \"ConnectToAcpid\" X configuration option.  "
+      "If this option is set, the NVIDIA X driver will attempt to connect "
+      "to the Linux ACPI daemon (acpid).  Set this option to off to prevent "
+      "the X driver from attempting to connect to acpid." },
+
     { "constant-dpi",
       XCONFIG_BOOL_VAL(CONSTANT_DPI_BOOL_OPTION), NVGETOPT_IS_BOOLEAN, NULL,
       "Enable or disable the \"ConstantDPI\" X configuration option, "
@@ -208,6 +224,13 @@ static const NVGetoptOption __options[] = {
       NVGETOPT_IS_BOOLEAN, NULL,
       "Enable or disable support for dynamically configuring TwinView." },
     
+    { "enable-acpi-hotkeys",
+      XCONFIG_BOOL_VAL(ENABLE_ACPI_HOTKEYS_BOOL_OPTION), 
+      NVGETOPT_IS_BOOLEAN, NULL,
+      "The \"EnableACPIHotkeys\" option can be specified to override the "
+      "NVIDIA X driver's default decision to enable or disable ACPI "
+      "display change hotkey events." },
+
     { "enable-all-gpus", 'a', 0, NULL,
       "Configure an X screen on every GPU in the system." },
     
@@ -253,6 +276,13 @@ static const NVGetoptOption __options[] = {
       "visible. This option forces stereo flipping even when no stereo "
       "drawables are visible." },
 
+    { "handle-special-keys", HANDLE_SPECIAL_KEYS_OPTION,
+      NVGETOPT_STRING_ARGUMENT | NVGETOPT_ALLOW_DISABLE, "WHEN",
+      "Specify when the X server should use the builtin keyboard handler to "
+      "process special key combinations (such as Ctrl+Alt+Backspace); see "
+      "the X configuration man page for details.  The value of [WHEN] can be "
+      "'Always', 'Never', or 'WhenNeeded'." },
+
     { "include-implicit-metamodes",
       XCONFIG_BOOL_VAL(INCLUDE_IMPLICIT_METAMODES_BOOL_OPTION),
       NVGETOPT_IS_BOOLEAN, NULL,
diff --git a/options.c b/options.c
index 64292b4..40d09e6 100644
--- a/options.c
+++ b/options.c
@@ -27,6 +27,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 #include "nvidia-xconfig.h"
 #include "xf86Parser.h"
@@ -75,6 +76,8 @@ static const NvidiaXConfigOption __options[] = {
     { DYNAMIC_TWINVIEW_BOOL_OPTION,          FALSE, "DynamicTwinView" },
     { INCLUDE_IMPLICIT_METAMODES_BOOL_OPTION,FALSE, "IncludeImplicitMetaModes" },
     { USE_EVENTS_BOOL_OPTION,                FALSE, "UseEvents" },
+    { CONNECT_TO_ACPID_BOOL_OPTION,          FALSE, "ConnectToAcpid" },
+    { ENABLE_ACPI_HOTKEYS_BOOL_OPTION,       FALSE, "EnableACPIHotkeys" },
     { 0,                                     FALSE, NULL },
 };
 
@@ -264,6 +267,41 @@ static void remove_option(XConfigScreenPtr screen, const char *name)
 
 
 /*
+ * get_screen_option() - get the option structure with the specified
+ * name, searching all the option lists associated with this screen
+ */
+
+XConfigOptionPtr get_screen_option(XConfigScreenPtr screen, const char *name)
+{
+    XConfigDisplayPtr display;
+    XConfigOptionPtr opt;
+
+    if (!screen) return NULL;
+
+    if (screen->device) {
+        opt = xconfigFindOption(screen->device->options, name);
+        if (opt) return opt;
+    }
+    if (screen->monitor) {
+        opt = xconfigFindOption(screen->monitor->options, name);
+        if (opt) return opt;
+    }
+
+    opt = xconfigFindOption(screen->options, name);
+    if (opt) return opt;
+
+    for (display = screen->displays; display; display = display->next) {
+        opt = xconfigFindOption(display->options, name);
+        if (opt) return opt;
+    }
+
+    return NULL;
+
+} /* get_screen_option() */
+
+
+
+/*
  * set_option_value() - set the given option to the specified value
  */
 
@@ -309,6 +347,137 @@ static void update_twinview_options(Options *op, XConfigScreenPtr screen)
 
 
 /*
+ * find_metamode_offset() - find the first metamode offset in
+ * 'string'; returns a pointer to the start of the offset
+ * specification and assigns 'end' (if non-NULL) to the first character
+ * beyond the offset specification.
+ */
+
+static char *find_metamode_offset(char *string, char **end)
+{
+    enum {
+        StateBeforeOffset,
+        StateInFirstPlus,
+        StateInFirstNumber,
+        StateInSecondPlus,
+        StateInSecondNumber
+    } state = StateBeforeOffset;
+
+    char *s, *start = NULL, c;
+
+    for (s = string; s && *s; s++) {
+        c = *s;
+        switch (state) {
+
+        case StateBeforeOffset:
+            if ((c == '-') || (c == '+')) {
+                start = s;
+                state = StateInFirstPlus;
+            }
+            break;
+
+        case StateInFirstPlus:
+            if (isspace(c)) state = StateInFirstPlus;
+            else if (isdigit(c)) state = StateInFirstNumber;
+            else state = StateBeforeOffset;
+            break;
+
+        case StateInFirstNumber:
+            if (isdigit(c) || isspace(c)) state = StateInFirstNumber;
+            else if ((c == '-') || (c == '+')) state = StateInSecondPlus;
+            else state = StateBeforeOffset;
+            break;
+
+        case StateInSecondPlus:
+            if (isspace(c)) state = StateInSecondPlus;
+            else if (isdigit(c)) state = StateInSecondNumber;
+            else state = StateBeforeOffset;
+            break;
+
+        case StateInSecondNumber:
+            if (isdigit(c)) state = StateInSecondNumber;
+            else goto done;
+            break;
+        }
+    }
+
+ done:
+    if (state == StateInSecondNumber) {
+        if (end) *end = s;
+        return start;
+    }
+
+    return NULL;
+
+} /* find_metamode_offset() */
+
+
+
+/*
+ * remove_metamode_offsets() - remove any offset specifications from
+ * the MetaMode option for this screen; if we find any offsets, return
+ * TRUE and assign old_metamodes and new_metamodes to copies of the
+ * MetaModes string before and after removing the offsets.  If no
+ * offsets appear in the MetaModes string, return FALSE.
+ */
+
+static int remove_metamode_offsets(XConfigScreenPtr screen,
+                                   char **old_metamodes, char **new_metamodes)
+{
+    char *start, *end;
+    char *new_string;
+    char *n, *o, *tmp;
+
+    XConfigOptionPtr opt = get_screen_option(screen, "MetaModes");
+
+    /* return if no MetaModes option */
+
+    if (!opt || !opt->val) return FALSE;
+
+    /* return if no explicit offsets in the MetaModes option */
+
+    if (!find_metamode_offset(opt->val, NULL)) return FALSE;
+
+    if (old_metamodes) *old_metamodes = nvstrdup(opt->val);
+
+    /*
+     * if we get this far, there are offsets in the MetaModes string;
+     * build a new string without the offsets
+     */
+
+    new_string = nvstrdup(opt->val);
+
+    o = start = opt->val;
+    n = new_string;
+
+    while (1) {
+
+        tmp = find_metamode_offset(start, &end);
+
+        if (tmp) *tmp = '\0';
+
+        while (*o) *n++ = *o++;
+
+        *n = '\0';
+
+        if (!tmp) break;
+
+        o = start = end;
+    }
+
+    nvfree(opt->val);
+
+    opt->val = new_string;
+
+    if (new_metamodes) *new_metamodes = nvstrdup(opt->val);
+
+    return TRUE;
+
+} /* remove_metamode_offsets() */
+
+
+
+/*
  * update_display_options() - update the Display SubSection options
  */
 
@@ -482,6 +651,16 @@ void update_options(Options *op, XConfigScreenPtr screen)
         }
     }
 
+    /* add acpid socket path option*/
+ 
+    if (op->acpid_socket_path) {
+        remove_option(screen, "AcpidSocketPath");
+        if (op->acpid_socket_path != NV_DISABLE_STRING_OPTION) {
+            set_option_value(screen, "AcpidSocketPath", op->acpid_socket_path);
+        }
+    }
+        
+
     /* add the twinview xinerama info order option */
     
     if (op->twinview_xinerama_info_order) {
@@ -497,8 +676,24 @@ void update_options(Options *op, XConfigScreenPtr screen)
     if (op->twinview_orientation) {
         remove_option(screen, "TwinViewOrientation");
         if (op->twinview_orientation != NV_DISABLE_STRING_OPTION) {
+            char *old_metamodes, *new_metamodes;
             set_option_value(screen, "TwinViewOrientation",
                              op->twinview_orientation);
+            if (remove_metamode_offsets(screen,
+                                        &old_metamodes, &new_metamodes)) {
+                fmtmsg("");
+                fmtwarn("The MetaModes option contained explicit offsets, "
+                        "which would have overridden the specified "
+                        "TwinViewOrientation; in order to honor the "
+                        "requested TwinViewOrientation, the explicit offsets "
+                        "have been removed from the MetaModes option.\n\n"
+                        "Old MetaModes option: \"%s\"\n"
+                        "New MetaModes option: \"%s\".",
+                        old_metamodes, new_metamodes);
+                fmtmsg("");
+                nvfree(old_metamodes);
+                nvfree(new_metamodes);
+            }
         }
     }