(file) Return to xf86Privstr.h CVS log (file) (dir) Up to [XFree86 CVS] / xc / programs / Xserver / hw / xfree86 / common

Diff for /xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h between version 1.1.2.8 and 1.18

version 1.1.2.8, 1998/06/11 16:01:19 version 1.18, 2000/02/08 13:13:06
Line 1 
Line 1 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h,v 1.1.2.7 1998/06/05 16:22:53 dawes Exp $ */  /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h,v 1.16 1999/07/11 10:27:05 dawes Exp $ */
  
 /* /*
  * Copyright (c) 1997,1998 by The XFree86 Project, Inc.  * Copyright (c) 1997,1998 by The XFree86 Project, Inc.
Line 13 
Line 13 
 #define _XF86PRIVSTR_H #define _XF86PRIVSTR_H
  
 #include "Xproto.h" #include "Xproto.h"
   #include "xf86Pci.h"
 #ifdef XINPUT #ifdef XINPUT
 #include "xf86Xinput.h"  
 #endif  
   
 /* Mouse device private record */  
   
 typedef struct _MouseDevRec {  
     DeviceProc          mseProc;        /* procedure for initializing */  
     void                (*mseEvents)(struct _MouseDevRec *);  
                                         /* proc for processing events */  
     DeviceIntPtr        device;  
     int                 mseFd;  
     char *              mseDevice;  
     MouseProtocol       mseType;  
     int                 baudRate;  
     int                 oldBaudRate;  
     int                 sampleRate;  
     int                 lastButtons;  
     int                 threshold;      /* acceleration */  
     int                 num;  
     int                 den;  
     int                 emulateState;   /* automata state for 2 button mode */  
     Bool                emulate3Buttons;  
     int                 emulate3Timeout;/* Timeout for 3 button emulation */  
     Bool                chordMiddle;  
     int                 mouseFlags;     /* Flags to Clear after opening  
                                          * mouse dev */  
     int                 truebuttons;    /* Arg to maintain before  
                                          * emulate3buttons timer callback */  
     /* xqueue part */  
     int                 xquePending;    /* was xqueFd, but nothing uses that */  
     int                 xqueSema;  
 #ifdef XINPUT  
     LocalDevicePtr      local;  
 #endif  
 } MouseDevRec, *MouseDevPtr;  
   
 #ifdef XINPUT  
 #define MOUSE_DEV(dev) (MouseDevPtr) XI_PRIVATE(dev)  
 #else  
 #define MOUSE_DEV(dev) (MouseDevPtr) (dev)->public.devicePrivate  
 #endif #endif
  
 /* PCI probe flags */ /* PCI probe flags */
Line 89 
Line 50 
     unsigned long       leds;     unsigned long       leds;
     unsigned long       xleds;     unsigned long       xleds;
     char *              vtinit;     char *              vtinit;
     KeymapKey *         specialKeyMap;  
     int                 scanPrefix;             /* scancode-state */     int                 scanPrefix;             /* scancode-state */
     Bool                capsLock;     Bool                capsLock;
     Bool                numLock;     Bool                numLock;
     Bool                scrollLock;     Bool                scrollLock;
     Bool                modeSwitchLock;     Bool                modeSwitchLock;
     Bool                serverNumLock;  
     Bool                composeLock;     Bool                composeLock;
     Bool                vtSysreq;     Bool                vtSysreq;
 #if defined(SVR4) && defined(i386) #if defined(SVR4) && defined(i386)
Line 107 
Line 66 
 #ifdef XINPUT #ifdef XINPUT
     pointer             mouseLocal;     pointer             mouseLocal;
 #endif #endif
     MouseDevPtr         mouseDev;  
  
     /* event handler part */     /* event handler part */
     int                 lastEventTime;     int                 lastEventTime;
Line 158 
Line 116 
                                                  * changed */                                                  * changed */
     Bool                miscModInDevAllowNonLocal;     Bool                miscModInDevAllowNonLocal;
     PciProbeType        pciFlags;     PciProbeType        pciFlags;
       Pix24Flags          pixmap24;
       MessageType         pix24From;
   #if defined(i386) || defined(__i386__)
       Bool                pc98;
   #endif
       Bool                pmFlag;
       int                 estimateSizesAggressively;
 } xf86InfoRec, *xf86InfoPtr; } xf86InfoRec, *xf86InfoPtr;
  
   
 #ifdef DPMSExtension #ifdef DPMSExtension
 /* Private info for DPMS */ /* Private info for DPMS */
 typedef struct { typedef struct {
Line 172 
Line 135 
 } DPMSRec, *DPMSPtr; } DPMSRec, *DPMSPtr;
 #endif #endif
  
   #ifdef XF86VIDMODE
 #ifdef XFreeXDGA  /* Private info for Video Mode Extentsion */
 /* Private info for DGA */  
 typedef struct { typedef struct {
     DGAInfoPtr          pDGAInfo;      DisplayModePtr      First;
     Bool                Active;      DisplayModePtr      Next;
     int                 Flags;     int                 Flags;
     CloseScreenProcPtr  CloseScreen;     CloseScreenProcPtr  CloseScreen;
 } DGARec, *DGAPtr;  } VidModeRec, *VidModePtr;
 #endif #endif
  
   typedef struct pciBusRec {
       int brbus, brdev, brfunc;   /* ID of the bridge to this bus */
       int primary, secondary, subordinate;
       int subclass;       /* bridge type */
       resPtr io;          /* I/O range */
       resPtr mem;         /* non-prefetchable memory range */
       resPtr pmem;        /* prefetchable memory range */
       int brcontrol;      /* bridge_control byte */
       struct pciBusRec *next;
   } PciBusRec, *PciBusPtr;
   
   /* private resource types */
   #define ResNoAvoid  ResBios
  
 /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */ /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
 #define XLED1   ((unsigned long) 0x00000001) #define XLED1   ((unsigned long) 0x00000001)
 #define XLED2   ((unsigned long) 0x00000002) #define XLED2   ((unsigned long) 0x00000002)
 #define XLED3   ((unsigned long) 0x00000004) #define XLED3   ((unsigned long) 0x00000004)
   #define XLED4   ((unsigned long) 0x00000008)
 #define XCAPS   ((unsigned long) 0x20000000) #define XCAPS   ((unsigned long) 0x20000000)
 #define XNUM    ((unsigned long) 0x40000000) #define XNUM    ((unsigned long) 0x40000000)
 #define XSCR    ((unsigned long) 0x80000000) #define XSCR    ((unsigned long) 0x80000000)


Legend:
Removed from v.1.1.2.8  
changed lines
  Added in v.1.18

Powered by
ViewCVS 0.9.2