- Timestamp:
- Aug 5, 2010 3:49:48 PM (15 years ago)
- svn:sync-xref-src-repo-rev:
- 64480
- Location:
- trunk/src/VBox/Additions/x11/vboxmouse
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/x11/vboxmouse/mouse.c
r28372 r31415 45 45 #include "XI.h" 46 46 #include "XIproto.h" 47 #include "extnsionst.h"48 #include "extinit.h"49 47 #else 50 48 #include "inputstr.h" -
trunk/src/VBox/Additions/x11/vboxmouse/xorg70/mouse.c
r28800 r31415 474 474 int target; /* target button */ 475 475 int lockM,targetM; /* bitmasks for drag lock, target */ 476 int i, j; /* indexes */476 int k, j; /* indexes */ 477 477 char *s1; /* parse input string */ 478 478 DragLockPtr pLock; … … 538 538 539 539 /* for each nibble */ 540 for ( i = 0; i < NIB_COUNT; i++) {540 for (k = 0; k < NIB_COUNT; k++) { 541 541 /* for each possible set of bits for that nibble */ 542 542 for (j = 0; j < NIB_SIZE; j++) { … … 554 554 * if otherbits =0 then only 1 bit set 555 555 * so j=fM 556 * nib_table[ i][fM] already calculated if fM has556 * nib_table[k][fM] already calculated if fM has 557 557 * only 1 bit set. 558 * nib_table[ i][j] has already been filled in558 * nib_table[k][j] has already been filled in 559 559 * by previous loop. otherwise 560 * otherbits < j so nibtable[ i][otherbits]560 * otherbits < j so nibtable[k][otherbits] 561 561 * has already been calculated. 562 562 */ 563 563 if (otherbits) 564 pLock->nib_table[ i][j] =565 pLock->nib_table[ i][fM] |566 pLock->nib_table[ i][otherbits];564 pLock->nib_table[k][j] = 565 pLock->nib_table[k][fM] | 566 pLock->nib_table[k][otherbits]; 567 567 568 568 } … … 3654 3654 case AUTOPROBE_SWITCH_PROTOCOL: 3655 3655 { 3656 MouseProtocolID prot o;3656 MouseProtocolID prot; 3657 3657 void *defaults; 3658 3658 AP_DBG(("State SWITCH_PROTOCOL\n")); 3659 prot o= mPriv->protoList[mPriv->protocolID++];3660 if (prot o== PROT_UNKNOWN)3659 prot = mPriv->protoList[mPriv->protocolID++]; 3660 if (prot == PROT_UNKNOWN) 3661 3661 mPriv->autoState = AUTOPROBE_SWITCHSERIAL; 3662 else if (!(defaults = GetProtocol(prot o)->defaults)3662 else if (!(defaults = GetProtocol(prot)->defaults) 3663 3663 || (mPriv->serialDefaultsNum == -1 3664 3664 && (defaults == msDefaults)) … … 3667 3667 == defaults)) { 3668 3668 AP_DBG(("Changing Protocol to %s\n", 3669 ProtocolIDToName(prot o)));3670 SetMouseProto(pMse,prot o);3669 ProtocolIDToName(prot))); 3670 SetMouseProto(pMse,prot); 3671 3671 FlushButtons(pMse); 3672 3672 RESET_VALIDATION; -
trunk/src/VBox/Additions/x11/vboxmouse/xorg70/pnp.c
r7261 r31415 714 714 if (u == 0x03) { 715 715 /* found IntelliMouse now try IntelliExplorer */ 716 unsigned char seq [] = { 243, 200, 243, 200, 243, 80 };717 if (ps2SendPacket(pInfo,seq ,sizeof(seq))) {716 unsigned char seq2[] = { 243, 200, 243, 200, 243, 80 }; 717 if (ps2SendPacket(pInfo,seq2,sizeof(seq2))) { 718 718 u = ps2GetDeviceID(pInfo); 719 719 if (u == 0x04) -
trunk/src/VBox/Additions/x11/vboxmouse/xorg71/mouse.c
r29712 r31415 489 489 int target; /* target button */ 490 490 int lockM,targetM; /* bitmasks for drag lock, target */ 491 int i, j; /* indexes */491 int k, j; /* indexes */ 492 492 char *s1; /* parse input string */ 493 493 DragLockPtr pLock; … … 553 553 554 554 /* for each nibble */ 555 for ( i = 0; i < NIB_COUNT; i++) {555 for (k = 0; k < NIB_COUNT; k++) { 556 556 /* for each possible set of bits for that nibble */ 557 557 for (j = 0; j < NIB_SIZE; j++) { … … 569 569 * if otherbits =0 then only 1 bit set 570 570 * so j=fM 571 * nib_table[ i][fM] already calculated if fM has571 * nib_table[k][fM] already calculated if fM has 572 572 * only 1 bit set. 573 * nib_table[ i][j] has already been filled in573 * nib_table[k][j] has already been filled in 574 574 * by previous loop. otherwise 575 * otherbits < j so nibtable[ i][otherbits]575 * otherbits < j so nibtable[k][otherbits] 576 576 * has already been calculated. 577 577 */ 578 578 if (otherbits) 579 pLock->nib_table[ i][j] =580 pLock->nib_table[ i][fM] |581 pLock->nib_table[ i][otherbits];579 pLock->nib_table[k][j] = 580 pLock->nib_table[k][fM] | 581 pLock->nib_table[k][otherbits]; 582 582 583 583 } … … 3669 3669 case AUTOPROBE_SWITCH_PROTOCOL: 3670 3670 { 3671 MouseProtocolID prot o;3671 MouseProtocolID prot; 3672 3672 void *defaults; 3673 3673 AP_DBG(("State SWITCH_PROTOCOL\n")); 3674 prot o= mPriv->protoList[mPriv->protocolID++];3675 if (prot o== PROT_UNKNOWN)3674 prot = mPriv->protoList[mPriv->protocolID++]; 3675 if (prot == PROT_UNKNOWN) 3676 3676 mPriv->autoState = AUTOPROBE_SWITCHSERIAL; 3677 else if (!(defaults = GetProtocol(prot o)->defaults)3677 else if (!(defaults = GetProtocol(prot)->defaults) 3678 3678 || (mPriv->serialDefaultsNum == -1 3679 3679 && (defaults == msDefaults)) … … 3682 3682 == defaults)) { 3683 3683 AP_DBG(("Changing Protocol to %s\n", 3684 ProtocolIDToName(prot o)));3685 SetMouseProto(pMse,prot o);3684 ProtocolIDToName(prot))); 3685 SetMouseProto(pMse,prot); 3686 3686 FlushButtons(pMse); 3687 3687 RESET_VALIDATION; -
trunk/src/VBox/Additions/x11/vboxmouse/xorg71/pnp.c
r7261 r31415 721 721 if (u == 0x03) { 722 722 /* found IntelliMouse now try IntelliExplorer */ 723 unsigned char seq [] = { 243, 200, 243, 200, 243, 80 };724 if (ps2SendPacket(pInfo,seq ,sizeof(seq))) {723 unsigned char seq2[] = { 243, 200, 243, 200, 243, 80 }; 724 if (ps2SendPacket(pInfo,seq2,sizeof(seq2))) { 725 725 u = ps2GetDeviceID(pInfo); 726 726 if (u == 0x04)
Note:
See TracChangeset
for help on using the changeset viewer.