xserver: Branch 'master' - 2 commits

[Tiago Vignatti]

 configure.ac                   |    1 -
 dix/dixfonts.c                 |    2 --
 hw/xfree86/common/xf86Events.c |   39 ---------------------------------------
 include/dix-config.h.in        |    3 ---
 4 files changed, 45 deletions(-)

New commits:
commit f3b29efc4d7bb346cdd3fd79e780f1022c8f46e8
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date:   Tue Jun 24 23:07:49 2008 -0300

    Remove NOFONTSERVERACCESS macro
    
    dix: this is semantically different but it goes through the same path in
    the code.

diff --git a/configure.ac b/configure.ac
index 201bfe4..ab6cb10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -962,7 +962,6 @@ fi
 
 if test "x$BUILTIN_FONTS" = xyes; then
        AC_DEFINE(BUILTIN_FONTS, 1, [Use only built-in fonts])
-       AC_DEFINE(NOFONTSERVERACCESS, 1, [Avoid using a font server])
        FONTPATH="built-ins"
 fi
 
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 83b264a..89f1528 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1920,8 +1920,6 @@ InitFonts (void)
         BuiltinRegisterFpeFunctions();
 #else
 	FontFileRegisterFpeFunctions();
-#endif
-#ifndef NOFONTSERVERACCESS
 	fs_register_fpe_functions();
 #endif
     }
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 0c515c5..ad74f77 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -480,9 +480,6 @@
 /* Use only built-in fonts */
 #undef BUILTIN_FONTS
 
-/* Avoid using font servers */
-#undef NOFONTSERVERACCESS
-
 /* Use an empty root cursor */
 #undef NULL_ROOT_CURSOR
 
commit 2ff7eb4995b663cf12a01124745de600f38d0bfc
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date:   Tue Jun 24 22:09:34 2008 -0300

    xfree86: kill INHERIT_LOCK_STATE macro.
    
    I don't know how this survived so long. Google didn't show
    anything usable related with this.

diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index a7f9578..e7effc8 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -196,45 +196,6 @@ void
 ProcessInputEvents ()
 {
   int x, y;
-#ifdef INHERIT_LOCK_STATE
-  static int generation = 0;
-#endif
-
-    /*
-     * With INHERIT_LOCK_STATE defined, the initial state of CapsLock, NumLock
-     * and ScrollLock will be set to match that of the VT the server is
-     * running on.
-     */
-#ifdef INHERIT_LOCK_STATE
-    if (generation != serverGeneration) {
-      xEvent kevent;
-      DevicePtr pKeyboard = xf86Info.pKeyboard;
-      extern unsigned int xf86InitialCaps, xf86InitialNum, xf86InitialScroll;
-
-      generation = serverGeneration;
-      kevent.u.keyButtonPointer.time = GetTimeInMillis();
-      kevent.u.keyButtonPointer.rootX = 0;
-      kevent.u.keyButtonPointer.rootY = 0;
-      kevent.u.u.type = KeyPress;
-
-
-      if (xf86InitialCaps) {
-        kevent.u.u.detail = xf86InitialCaps;
-        (* pKeyboard->processInputProc)(&kevent, (DeviceIntPtr)pKeyboard, 1);
-        xf86InitialCaps = 0;
-      }
-      if (xf86InitialNum) {
-        kevent.u.u.detail = xf86InitialNum;
-        (* pKeyboard->processInputProc)(&kevent, (DeviceIntPtr)pKeyboard, 1);
-        xf86InitialNum = 0;
-      }
-      if (xf86InitialScroll) {
-        kevent.u.u.detail = xf86InitialScroll;
-        (* pKeyboard->processInputProc)(&kevent, (DeviceIntPtr)pKeyboard, 1);
-        xf86InitialScroll = 0;
-      }
-    }
-#endif
 
   mieqProcessInputEvents();