Changeset 1252

Show
Ignore:
Timestamp:
11/27/08 15:30:40 (4 years ago)
Author:
mösi
Message:

Modifier noch besser in die CharOut-Struktur eingearbeitet

Location:
windows/neo-vars/src/source
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • windows/neo-vars/src/source/shortcuts.ahk

    r1226 r1252  
    144144CSSNClr := "NumpadClear" 
    145145 
     146CSSL_M2 := "LShift" 
     147CSSR_M2 := "RShift" 
    146148 
    147149/* 

  • windows/neo-vars/src/source/varsfunctions.ahk

    r1249 r1252  
    196196CharProcM2LD() { 
    197197  global 
    198   if (isShiftRPressed and !isShiftLPressed and !wasNonShiftKeyPressed) 
    199     ToggleMod2Lock() 
    200   isShiftLPressed := 1 
    201   isShiftPressed := 1 
    202   wasNonShiftKeyPressed := 0 
    203   EbeneAktualisieren() 
    204   PRVKA0SC02A := "PM2LU" 
    205   send {blind}{LShift Down} 
     198  if (!isShiftLPressed) { 
     199    if (isShiftRPressed and !wasNonShiftKeyPressed) 
     200      ToggleMod2Lock() 
     201    isShiftLPressed := 1 
     202    isShiftPressed := 1 
     203    wasNonShiftKeyPressed := 0 
     204    EbeneAktualisieren() 
     205    PR%PhysKey% := "PM2LU" 
     206  } 
     207  CharOutDown("SL_M2") 
    206208} 
    207209 
    … …  
    211213  isShiftPressed := isShiftRPressed 
    212214  EbeneAktualisieren() 
    213   send {blind}{LShift Up} 
     215  CharOutUp("SL_M2") 
    214216} 
    215217 
    216218CharProcM2RD() { 
    217219  global 
    218   if (isShiftLPressed and !isShiftRPressed and !wasNonShiftKeyPressed) 
    219     ToggleMod2Lock() 
    220   isShiftRPressed := 1 
    221   isShiftPressed := 1 
    222   wasNonShiftKeyPressed := 0 
    223   EbeneAktualisieren() 
    224   PRVKA1SC136 := "PM2RU" 
    225   send {blind}{RShift Down} 
     220  if (!isShiftRPressed) { 
     221    if (isShiftLPressed and !wasNonShiftKeyPressed) 
     222      ToggleMod2Lock() 
     223    isShiftRPressed := 1 
     224    isShiftPressed := 1 
     225    wasNonShiftKeyPressed := 0 
     226    EbeneAktualisieren() 
     227    PR%PhysKey% := "PM2RU" 
     228  } 
     229  CharOutDown("SR_M2") 
    226230} 
    227231 
    … …  
    231235  isShiftPressed := isShiftLPressed 
    232236  EbeneAktualisieren() 
    233   send {blind}{RShift Up} 
     237  CharOutUp("SR_M2") 
    234238} 
    235239 
    236240CharProcM3LD() { 
    237241  global 
    238   if (isMod3RPressed and !isMod3LPressed and !wasNonShiftKeyPressed) 
    239     CharStarDown("MOD3", "MOD3", "SComp") 
    240   isMod3LPressed := 1 
    241   isMod3Pressed := 1 
    242   wasNonShiftKeyPressed := 0 
    243   EbeneAktualisieren() 
    244   PRVK14SC03A := "PM3LU" 
     242  if (!isMod3LPressed) { 
     243    if (isMod3RPressed and !wasNonShiftKeyPressed) 
     244      CharStarDown("MOD3", "MOD3", "SComp") 
     245    isMod3LPressed := 1 
     246    isMod3Pressed := 1 
     247    wasNonShiftKeyPressed := 0 
     248    EbeneAktualisieren() 
     249    PR%PhysKey% := "PM3LU" 
     250  } 
    245251} 
    246252 
    … …  
    256262CharProcM3RD() { 
    257263  global 
    258   if (isMod3LPressed and !isMod3RPressed and !wasNonShiftKeyPressed) 
    259     CharStarDown("MOD3", "MOD3", "SComp") 
    260   isMod3RPressed := 1 
    261   isMod3Pressed := 1 
    262   wasNonShiftKeyPressed := 0 
    263   EbeneAktualisieren() 
    264   PRVKBFSC02B := "PM3RU" 
     264  if (!Mod3RPressed) { 
     265    if (isMod3LPressed and !wasNonShiftKeyPressed) 
     266      CharStarDown("MOD3", "MOD3", "SComp") 
     267    isMod3RPressed := 1 
     268    isMod3Pressed := 1 
     269    wasNonShiftKeyPressed := 0 
     270    EbeneAktualisieren() 
     271    PR%PhysKey% := "PM3RU" 
     272  } 
    265273} 
    266274 
    … …  
    276284CharProcM4LD() { 
    277285  global 
    278   wasMod4LPressed := isMod4LPressed 
    279   isMod4LPressed := 1 
    280   isMod4Pressed := 1 
    281   waswasNonShiftKeyPressed := wasNonShiftKeyPressed 
    282   wasNonShiftKeyPressed := 0 
    283   EbeneAktualisieren() 
    284   PRVKE2SC056 := "PM4LU" 
    285   if (isMod4RPressed and !wasMod4LPressed and !waswasNonShiftKeyPressed) 
    286     ToggleMod4Lock() 
     286  if (!isMod4LPressed) { 
     287    isMod4LPressed := 1 
     288    isMod4Pressed := 1 
     289    EbeneAktualisieren() 
     290    PR%PhysKey% := "PM4LU" 
     291    if (isMod4RPressed and !wasNonShiftKeyPressed) { 
     292      wasNonShiftKeyPressed := 0 
     293      ToggleMod4Lock() 
     294    } else 
     295      wasNonShiftKeyPressed := 0 
     296  } 
    287297} 
    288298 
    … …  
    296306CharProcM4RD() { 
    297307  global 
    298   wasMod4RPressed := isMod4RPressed 
    299   isMod4RPressed := 1 
    300   isMod4Pressed := 1 
    301   waswasNonShiftKeyPressed := wasNonShiftKeyPressed 
    302   wasNonShiftKeyPressed := 0 
    303   EbeneAktualisieren() 
    304   PRVKA5SC138 := "PM4RU" 
    305   if (isMod4LPressed and !wasMod4RPressed and !waswasNonShiftKeyPressed) 
    306     ToggleMod4Lock() 
     308  if (!isMod4RPressed) { 
     309    isMod4RPressed := 1 
     310    isMod4Pressed := 1 
     311    EbeneAktualisieren() 
     312    PR%PhysKey% := "PM4RU" 
     313    if (isMod4LPressed and !wasNonShiftKeyPressed) { 
     314      wasNonShiftKeyPressed := 0 
     315      ToggleMod4Lock() 
     316    } else 
     317      wasNonShiftKeyPressed := 0 
     318  } 
    307319} 
    308320