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

Diff for /xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c between version 1.4 and 1.5

version 1.4, 2000/06/20 05:08:50 version 1.5, 2000/08/01 20:05:43
Line 26 
Line 26 
  *  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *  *
  * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.3 2000/06/13 23:15:51 dawes Exp $   * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.4 2000/06/20 05:08:50 dawes Exp $
  */  */
  
 #include "config.h" #include "config.h"
Line 82 
Line 82 
 static void ScaleJumpCallback(Widget, XtPointer, XtPointer); static void ScaleJumpCallback(Widget, XtPointer, XtPointer);
  
 static void ApplyCallback(Widget, XtPointer, XtPointer); static void ApplyCallback(Widget, XtPointer, XtPointer);
   static void AccessXInitialize(void);
  
 /* /*
  * Implementation  * Implementation
Line 90 
Line 91 
 startaccessx(void) startaccessx(void)
 { {
     InitializeKeyboard();     InitializeKeyboard();
   
     XkbGetControls(DPY, XkbAllControlsMask, xkb_info->xkb);     XkbGetControls(DPY, XkbAllControlsMask, xkb_info->xkb);
     if (xkb_info->xkb->ctrls == NULL)     if (xkb_info->xkb->ctrls == NULL)
         xkb_info->xkb->ctrls = (XkbControlsPtr)         xkb_info->xkb->ctrls = (XkbControlsPtr)
             XtCalloc(1, sizeof(XkbControlsRec));             XtCalloc(1, sizeof(XkbControlsRec));
   
     xkb_info->xkb->ctrls->enabled_ctrls |= XkbMouseKeysMask |     xkb_info->xkb->ctrls->enabled_ctrls |= XkbMouseKeysMask |
                                            XkbMouseKeysAccelMask;                                            XkbMouseKeysAccelMask;
     xkb_info->xkb->ctrls->mk_delay = 40;     xkb_info->xkb->ctrls->mk_delay = 40;
Line 153 
Line 156 
     Arg args[1];     Arg args[1];
     Boolean state;     Boolean state;
     Widget stickyForm, mouseForm, repeatForm, slowForm, bounceForm;     Widget stickyForm, mouseForm, repeatForm, slowForm, bounceForm;
     float val;      float val, tmp;
  
     if (!first)     if (!first)
         return;         return;
Line 380 
Line 383 
     XtSetArg(args[0], XtNstate, &state);     XtSetArg(args[0], XtNstate, &state);
     XtGetValues(mouse, args, 1);     XtGetValues(mouse, args, 1);
     EnableCallback(mouse, (XtPointer)mouseForm, (XtPointer)(int)state);     EnableCallback(mouse, (XtPointer)mouseForm, (XtPointer)(int)state);
     if (xkb_info->xkb->ctrls->mk_interval > 10)  
         val = (float)(xkb_info->xkb->ctrls->mk_interval - 10) /  
               (float)MAX_MOUSE_SPEED;  
     else  
         val = 10.0 / (float)MAX_MOUSE_SPEED;  
     ScaleJumpCallback(mouseSpeed->scroller, (XtPointer)mouseSpeed,  
                       (XtPointer)&val);  
     if (xkb_info->xkb->ctrls->mk_time_to_max > 10)     if (xkb_info->xkb->ctrls->mk_time_to_max > 10)
         val = (float)(xkb_info->xkb->ctrls->mk_time_to_max - 10) /          val = (float)((xkb_info->xkb->ctrls->mk_time_to_max * (40. / 10.))) /
               (float)(MAX_MOUSE_TIME * 100);               (float)(MAX_MOUSE_TIME * 100);
     else     else
         val = 10.0 / (float)(MAX_MOUSE_TIME * 100);         val = 10.0 / (float)(MAX_MOUSE_TIME * 100);
     ScaleJumpCallback(mouseTime->scroller, (XtPointer)mouseTime,     ScaleJumpCallback(mouseTime->scroller, (XtPointer)mouseTime,
                       (XtPointer)&val);                       (XtPointer)&val);
       tmp = mouseTime->value;
       if (xkb_info->xkb->ctrls->mk_max_speed != 0)
           val = (float)(xkb_info->xkb->ctrls->mk_max_speed / tmp - 10) /
                 (float)MAX_MOUSE_SPEED;
       else
           val = 10.0 / (float)MAX_MOUSE_SPEED;
       ScaleJumpCallback(mouseSpeed->scroller, (XtPointer)mouseSpeed,
                         (XtPointer)&val);
     if (xkb_info->xkb->ctrls->mk_delay > 10)     if (xkb_info->xkb->ctrls->mk_delay > 10)
         val = (float)(xkb_info->xkb->ctrls->mk_delay - 10) /         val = (float)(xkb_info->xkb->ctrls->mk_delay - 10) /
               (float)(MAX_MOUSE_DELAY * 100);               (float)(MAX_MOUSE_DELAY * 100);
Line 586 
Line 590 
             xkb_info->config.mk_delay =             xkb_info->config.mk_delay =
             xkb_info->xkb->ctrls->mk_delay = mouseDelay->value * 100;             xkb_info->xkb->ctrls->mk_delay = mouseDelay->value * 100;
             xkb_info->config.mk_interval =             xkb_info->config.mk_interval =
             xkb_info->xkb->ctrls->mk_interval = mouseSpeed->value;                  xkb_info->xkb->ctrls->mk_interval = 40;
             xkb_info->config.mk_time_to_max =             xkb_info->config.mk_time_to_max =
             xkb_info->xkb->ctrls->mk_time_to_max = mouseTime->value * 100;              xkb_info->xkb->ctrls->mk_time_to_max =
 /*          xkb_info->xkb->ctrls->mk_max_speed = 500;                  (mouseTime->value * 1000) / xkb_info->xkb->ctrls->mk_interval;
             xkb_info->xkb->ctrls->mk_curve = 0;*/              xkb_info->config.mk_max_speed =
               xkb_info->xkb->ctrls->mk_max_speed =
                   mouseSpeed->value * mouseTime->value;
               xkb_info->config.mk_curve = xkb_info->xkb->ctrls->mk_curve = 0;
         }         }
         else {         else {
             xkb_info->config.initial_ctrls &= ~(XkbMouseKeysMask |             xkb_info->config.initial_ctrls &= ~(XkbMouseKeysMask |

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5
Powered by
ViewCVS 0.9.2