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

Diff for /xc/programs/Xserver/hw/xfree86/common/xf86MiscExt.c between version 1.5 and 1.6

version 1.5, 2000/04/17 16:29:53 version 1.6, 2000/08/04 16:13:25
Line 34 
Line 34 
  
 #include "xf86OSmouse.h" #include "xf86OSmouse.h"
 #include "../input/mouse/mouse.h" #include "../input/mouse/mouse.h"
 #define DEBUG  
 #ifdef DEBUG #ifdef DEBUG
 # define DEBUG_P(x) ErrorF(x"\n"); # define DEBUG_P(x) ErrorF(x"\n");
 #else #else
Line 53 
Line 53 
         int     em3timeout;         int     em3timeout;
         Bool    chordmiddle;         Bool    chordmiddle;
         int     flags;         int     flags;
           char*   device;
         pointer private;         pointer private;
 } mseParamsRec, *mseParamsPtr; } mseParamsRec, *mseParamsPtr;
  
Line 202 
Line 203 
 } }
  
 Bool Bool
   MiscExtSetMouseDevice(pointer mouse, char* device)
   {
       mseParamsPtr mse = mouse;
   
       mse->device = device;
       return TRUE;
   }
   
   Bool
 MiscExtGetKbdSettings(pointer *kbd) MiscExtGetKbdSettings(pointer *kbd)
 { {
     kbdParamsPtr kbdptr;     kbdParamsPtr kbdptr;
Line 411 
Line 421 
         if (reopen)         if (reopen)
             (pMse->device->deviceProc)(pMse->device, DEVICE_ON);             (pMse->device->deviceProc)(pMse->device, DEVICE_ON);
         /* Set pInfo->options too */         /* Set pInfo->options too */
   
          if (mse->device)
              xf86ReplaceStrOption(pInfo->options, "Device", mse->device);
  
     }     }
     if (mse_or_kbd == MISC_KEYBOARD) {     if (mse_or_kbd == MISC_KEYBOARD) {


Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

Powered by
ViewCVS 0.9.2