Ticket #391: prog2014-09-02.patch

File prog2014-09-02.patch, 14.7 KB (added by arBmind, 10 years ago)

Patch vom 02.09.2014

  • windows/neo-vars/src/neo20-all.ahk

     
    3838#include    source\nordtast.ahk
    3939#include    source\qwertz.ahk
    4040#include    source\tools.ahk
     41#include    source\programmer.ahk
    4142
    4243; individuelle Einstellungen
    4344#include *i %A_AppData%\Neo2\custom.ahk
  • windows/neo-vars/src/source/keydefinitions.ahk

     
    129129  if (caps == 0)
    130130    NOC%pos% := 1
    131131  else {
     132    NOC%pos% := 0
    132133    if (e1 != "")
    133134      UNSH%e1% := 1 ; unshift wenn caps lock + Shift?
     135    else
     136      UNSH%e1% := 0
    134137  }
    135138  SetKeyPos("CP1" . pos,e1)
    136139  SetKeyPos("CP2" . pos,e2)
  • windows/neo-vars/src/source/programmer.ahk

     
     1; -*- encoding:utf-8 -*-
     2; Programmer Belegungen
     3; Coffee++ and Q-KOIN-M (by Ruben Barkow)
     4; EurKey (by Steffen Brüntjen)
     5
     6CharProcProgTt() {
     7  global
     8
     9  ; Custom Layout togglen
     10  if (isProgrammer == 0) {
     11    isProgrammer := 1
     12    CharProcProgT1()
     13    if (zeigeModusBox)
     14      TrayTip,Programmer-Belegungsvariante,Die Belegungsvariante Coffee++ wurde aktiviert. Zum Umschalten`, Mod3+F5 drücken.,10,1
     15  } else if (isProgrammer == 1) {
     16    isProgrammer := 2
     17    CharProcProgT2()
     18    if (zeigeModusBox)
     19      TrayTip,Programmer-Belegungsvariante,Die Belegungsvariante Q-KOIN-M wurde aktiviert. Zum Umschalten`, Mod3+F5 drücken.,10,1
     20  }  else if (isProgrammer == 2) {
     21    isProgrammer := 3
     22    CharProcProgT3()
     23    if (zeigeModusBox)
     24      TrayTip,Programmer-Belegungsvariante,Die Belegungsvariante EurKey wurde aktiviert. Zum Umschalten`, Mod3+F5 drücken.,10,1
     25  } else {
     26    isProgrammer := 0
     27    CharProcProgT0()
     28    if (zeigeModusBox)
     29      TrayTip,Programmer-Belegungsvariante,Die Belegungsvariante wurde deaktiviert.,10,1
     30  }
     31}
     32
     33PL_Backup(pos) {
     34  global
     35  PO_CP1%pos% := CP1%pos%
     36  PO_CP2%pos% := CP2%pos%
     37  PO_CP3%pos% := CP3%pos%
     38  PO_CP4%pos% := CP4%pos%
     39  PO_CP5%pos% := CP5%pos%
     40  PO_CP6%pos% := CP6%pos%
     41  PO_CP7%pos% := CP7%pos%
     42  PO_CP8%pos% := CP8%pos%
     43  if (POList == "")
     44    POList := pos
     45  else
     46    POList := POList . "," . pos
     47}
     48PL_Restore(pos) {
     49  global
     50  CP1%pos% := PO_CP1%pos%
     51  CP2%pos% := PO_CP2%pos%
     52  CP3%pos% := PO_CP3%pos%
     53  CP4%pos% := PO_CP4%pos%
     54  CP5%pos% := PO_CP5%pos%
     55  CP6%pos% := PO_CP6%pos%
     56  CP7%pos% := PO_CP7%pos%
     57  CP8%pos% := PO_CP8%pos%
     58}
     59PL_RestoreAll() {
     60  global
     61  Loop, parse, POList, `,
     62    PL_Restore(A_LoopField)
     63}
     64
     65PL_ED(pos,caps,e1a,e2a,e3a,e4a,e5a,e6a,e7a="",e8a="") {
     66  global
     67  PL_Backup(pos)
     68  ED(pos,caps,e1a,e2a,e3a,e4a,e5a,e6a,e7a,e8a)
     69}
     70
     71PL_EDS(scpos,caps,e1a,e2a,e3a,e4a,e5a,e6a,e7a="",e8a="") {
     72  global
     73  PL_ED(vksc%scpos%,caps,e1a,e2a,e3a,e4a,e5a,e6a,e7a,e8a)
     74}
     75
     76CharProcProgT1() {
     77global
     78POList := ""
     79;   KeyCode       Ebene1  Ebene2  Ebene3  Ebene4  Ebene5  Ebene6  Ebene7* Ebene8*
     80; Reihe 1
     81PL_EDS("029",1,"q","Q","7","T__abdt","÷","T__bldt") ; circumflex
     82PL_EDS("002",1,"p","P","8","ª"      ,"!","¬") ; 1
     83PL_EDS("003",1,"f","F","9","º"      ,"""","∨") ; 2
     84PL_EDS("004",1,"m","M","0","№"      ,"\","∧") ; 3
     85PL_EDS("005",1,"u","U","1","⋮"       ,"½","⊥") ; 4
     86PL_EDS("006",1,"k","K","2","·"      ,"%","∡") ; 5
     87PL_EDS("007",1,"y","Y","3","£"      ,"³","∥") ; 6
     88PL_EDS("008",0,"$","x","4","¤"      ,"¼","→") ; 7
     89PL_EDS("009",0,"/","€","∑",""       ,"⅓","∞") ; 8
     90PL_EDS("00A",0,"+","&","T__cron","S__NDiv","±","∝") ; 9
     91PL_EDS("00B",0,"*","§","¤","S__NMul","×","∅") ; 0
     92PL_EDS("00C",0,"T__drss","ß","«" ,"S__NSub","£","­") ; ß
     93PL_EDS("00D",0,"!","T__acut","»","T__drss","¡","T__mcrn") ; `
     94; Reihe 2
     95PL_EDS("010",1,"w","W","@","S__PgUp","'","Ξ") ; q
     96PL_EDS("011",1,"i","I","[","U000008","+" ,"√") ; w
     97PL_EDS("012",1,"r","R","]","S____Up","/","Λ") ; e
     98PL_EDS("013",1,"h","H","(","S___Del","#","ℂ") ; r
     99PL_EDS("014",1,"l","L",")","S__PgDn","*","Ω") ; t
     100PL_EDS("015",1,"z","Z","5","¡"      ,"⅔","×") ; z
     101PL_EDS("016",0,"(","{","T__cedi","S__N__7","¢","Ψ") ; u
     102PL_EDS("017",0,")","}","S____Up","S__N__8","Я","Γ") ; i
     103PL_EDS("018",0,"=","%","S__PgUp","S__N__9","‰","Φ") ; o
     104PL_EDS("019",0,"[","|","S___Del","S__NAdd","¦","ℚ") ; p
     105PL_EDS("01A",0,">","T__grav","©","−"      ,"›","∘") ; ü
     106PL_EDS("01B",0,"<","T__cflx","T__tlde","T__dbac","‹","T__brve") ; +
     107; Reihe 3
     108PL_EDS("01E",1,"a","A","?","S__Home","ß" ,"⊂") ; a
     109PL_EDS("01F",1,"s","S",".","S__Left","&","∫") ; s
     110PL_EDS("020",1,"d","D","U00000D","S__Down",":","∀") ; d
     111PL_EDS("021",1,"o","O","U000008","S__Rght","T__mcrn","∃") ; f
     112PL_EDS("022",1,"c","C",";","S___End","T__acut","∈") ; g
     113PL_EDS("023",1,"g","G","6","¿"      ,"™","Σ") ; h
     114PL_EDS("024",1,"e","E","S__Left","S__N__4","æ","ℕ") ; j
     115PL_EDS("025",1,"n","N","S__Down","S__N__5","®","ℝ") ; k
     116PL_EDS("026",1,"t","T","S__Rght","S__N__6","→","∂") ; l
     117PL_EDS("027",1,"i","I","ø","S__NDot","Ø","Δ") ; ö
     118PL_EDS("028",0,"]","?","¿","."      ,"↔","∇") ; ä
     119PL_EDS("02B",0,"'","#","T__abrg","" ,"►","") ; #
     120; Reihe 4
     121PL_EDS("056",1,"x","X","|","P__M4LD",",","P__M4LD") ; <>
     122PL_EDS("02C",1,"v","V",">","U00001B","<" ,"∪") ; y
     123PL_EDS("02D",1,"t","T","=","U000009","T__grav","∩") ; x
     124PL_EDS("02E",1,"n","N","_","S___Ins","T__tlde","ℵ") ; c
     125PL_EDS("02F",1,"e","E","-","U00000D","²","Π") ; v
     126PL_EDS("030",1,"b","B","{",""      ,"∞","ℤ") ; b
     127PL_EDS("031",1,"j","J","}",":"      ,"¥","⇐") ; n
     128PL_EDS("032",0,"""","\","S__Home","S__N__1","µ","⇔") ; m
     129PL_EDS("033",0,",",";","S___End","S__N__2","—","⇒") ; ,
     130PL_EDS("034",0,".",":","S__PgDn","S__N__3","·","↦") ; .
     131PL_EDS("035",0,"-","_","¯",";"      ,"–","Θ") ; -
     132
     133; other keys
     134PL_Backup("space")
     135PL_Backup("esc"  )
     136PL_Backup("tab"  )
     137PL_Backup("F1"   )
     138PL_Backup("F2"   )
     139PL_Backup("F3"   )
     140PL_Backup("F4"   )
     141PL_Backup("F5"   )
     142PL_Backup("F6"   )
     143PL_Backup("F7"   )
     144PL_Backup("F8"   )
     145PL_Backup("F9"   )
     146PL_Backup("F10"  )
     147PL_Backup("F11"  )
     148PL_Backup("F12"  )
     149PL_Backup("enter")
     150
     151; Die Modifier
     152;ED1S("02A","P__M2LD") ; Mod2L (ShiftL)
     153;ED1S("136","P__M2RD") ; Mod2R (ShiftR)
     154;ED1S("03A","P__M3LD") ; Mod3L (CapsLock)
     155PL_EDS("138",0,"P__M3RD","P__M3RD","P__M3RD","P__M3RD","P__M3RD","P__M3RD") ; Mod3R (AltGr)
     156}
     157
     158CharProcProgT2() {
     159global
     160PL_RestoreAll()
     161POList := ""
     162;   KeyCode       Ebene1  Ebene2  Ebene3  Ebene4  Ebene5  Ebene6  Ebene7* Ebene8*
     163; Reihe 1
     164PL_EDS("029",1,"q","Q","7","T__abdt","÷","T__bldt") ; circumflex
     165PL_EDS("002",1,"k","K","8","ª"      ,"!","¬") ; 1
     166PL_EDS("003",1,"o","O","9","º"      ,"""","∨") ; 2
     167PL_EDS("004",1,"i","I","0","№"      ,"\","∧") ; 3
     168PL_EDS("005",1,"n","N","1","⋮"       ,"½","⊥") ; 4
     169PL_EDS("006",1,"m","M","2","·"      ,"%","∡") ; 5
     170PL_EDS("007",1,"y","Y","3","£"      ,"³","∥") ; 6
     171PL_EDS("008",0,"$","T__tlde","4","¤"      ,"¼","→") ; 7
     172PL_EDS("009",0,"/","@","∑",""       ,"⅓","∞") ; 8
     173PL_EDS("00A",0,"+","&","T__cron","S__NDiv","±","∝") ; 9
     174PL_EDS("00B",0,"*","§","¤","S__NMul","×","∅") ; 0
     175PL_EDS("00C",0,"T__drss","ß","«" ,"S__NSub","£","­") ; ß
     176PL_EDS("00D",0,"!","T__acut","»","T__drss","¡","T__mcrn") ; `
     177; Reihe 2
     178PL_EDS("010",1,"p","P","@","S__PgUp","'","Ξ") ; q
     179PL_EDS("011",1,"w","W","[","U000008","+" ,"√") ; w
     180PL_EDS("012",1,"e","E","]","S____Up","/","Λ") ; e
     181PL_EDS("013",1,"r","R","(","S___Del","#","ℂ") ; r
     182PL_EDS("014",1,"t","T",")","S__PgDn","*","Ω") ; t
     183PL_EDS("015",1,"z","Z","5","¡"      ,"⅔","×") ; z
     184PL_EDS("016",0,"(","{","T__cedi","S__N__7","¢","Ψ") ; u
     185PL_EDS("017",0,")","}","S____Up","S__N__8","Я","Γ") ; i
     186PL_EDS("018",0,"=","%","S__PgUp","S__N__9","‰","Φ") ; o
     187PL_EDS("019",0,"[","|","S___Del","S__NAdd","¦","ℚ") ; p
     188PL_EDS("01A",0,">","T__grav","©","−"      ,"›","∘") ; ü
     189PL_EDS("01B",0,"<","T__cflx","T__tlde","T__dbac","‹","T__brve") ; +
     190; Reihe 3
     191PL_EDS("01E",1,"a","A","?","S__Home","ß" ,"⊂") ; a
     192PL_EDS("01F",1,"s","S",".","S__Left","&","∫") ; s
     193PL_EDS("020",1,"d","D","U00000D","S__Down",":","∀") ; d
     194PL_EDS("021",1,"f","F","U000008","S__Rght","T__mcrn","∃") ; f
     195PL_EDS("022",1,"g","G",";","S___End","T__acut","∈") ; g
     196PL_EDS("023",1,"h","H","6","¿"      ,"™","Σ") ; h
     197PL_EDS("024",1,"n","N","S__Left","S__N__4","æ","ℕ") ; j
     198PL_EDS("025",1,"i","I","S__Down","S__N__5","®","ℝ") ; k
     199PL_EDS("026",1,"o","O","S__Rght","S__N__6","→","∂") ; l
     200PL_EDS("027",1,"e","E","ø","S__NDot","Ø","Δ") ; ö
     201PL_EDS("028",0,"]","?","¿","."      ,"↔","∇") ; ä
     202PL_EDS("02B",0,"'","#","T__abrg","" ,"►","") ; #
     203; Reihe 4
     204PL_EDS("056",1,"x","X","|","P__M4LD",",","P__M4LD") ; <>
     205PL_EDS("02C",1,"v","V",">","U00001B","<" ,"∪") ; y
     206PL_EDS("02D",1,"l","L","=","U000009","T__grav","∩") ; x
     207PL_EDS("02E",1,"c","C","_","S___Ins","T__tlde","ℵ") ; c
     208PL_EDS("02F",1,"u","U","-","U00000D","²","Π") ; v
     209PL_EDS("030",1,"b","B","{",""      ,"∞","ℤ") ; b
     210PL_EDS("031",1,"j","J","}",":"      ,"¥","⇐") ; n
     211PL_EDS("032",0,"""","\","S__Home","S__N__1","µ","⇔") ; m
     212PL_EDS("033",0,",",";","S___End","S__N__2","—","⇒") ; ,
     213PL_EDS("034",0,".",":","S__PgDn","S__N__3","·","↦") ; .
     214PL_EDS("035",0,"-","_","¯",";"      ,"–","Θ") ; -
     215
     216; other keys
     217PL_Backup("space")
     218PL_Backup("esc"  )
     219PL_Backup("tab"  )
     220PL_Backup("F1"   )
     221PL_Backup("F2"   )
     222PL_Backup("F3"   )
     223PL_Backup("F4"   )
     224PL_Backup("F5"   )
     225PL_Backup("F6"   )
     226PL_Backup("F7"   )
     227PL_Backup("F8"   )
     228PL_Backup("F9"   )
     229PL_Backup("F10"  )
     230PL_Backup("F11"  )
     231PL_Backup("F12"  )
     232PL_Backup("enter")
     233
     234; Die Modifier
     235;ED1S("02A","P__M2LD") ; Mod2L (ShiftL)
     236;ED1S("136","P__M2RD") ; Mod2R (ShiftR)
     237;ED1S("03A","P__M3LD") ; Mod3L (CapsLock)
     238PL_EDS("138",0,"P__M3RD","P__M3RD","P__M3RD","P__M3RD","P__M3RD","P__M3RD") ; Mod3R (AltGr)
     239}
     240
     241
     242CharProcProgT3() {
     243global
     244PL_RestoreAll()
     245POList := ""
     246;   KeyCode       Ebene1  Ebene2  Ebene3  Ebene4  Ebene5  Ebene6  Ebene7* Ebene8*
     247; Reihe 1
     248PL_EDS("029",0,"``","~","T__grav","T__abdt","T__tlde","T__bldt") ; circumflex
     249PL_EDS("002",0,"1","!","¡","ª"      ,"¹","¬") ; 1
     250PL_EDS("003",0,"2","@","ª","º"      ,"²","∨") ; 2
     251PL_EDS("004",0,"3","#","º","№"      ,"³","∧") ; 3
     252PL_EDS("005",0,"4","$","£","⋮"       ,"¥","⊥") ; 4
     253PL_EDS("006",0,"5","%","€","·"      ,"¢","∡") ; 5
     254PL_EDS("007",0,"6","^","T__cflx","£"      ,"T__cron","∥") ; 6
     255PL_EDS("008",0,"7","&","T__abrg","¤"      ,"T__mcrn","→") ; 7
     256PL_EDS("009",0,"8","*","„",""       ,"‚","∞") ; 8
     257PL_EDS("00A",0,"9","(","“","S__NDiv","‘","∝") ; 9
     258PL_EDS("00B",0,"0",")","”","S__NMul","’","∅") ; 0
     259PL_EDS("00C",0,"-","_","©" ,"S__NSub","№","­") ; ß
     260PL_EDS("00D",0,"=","+","×","T__drss","÷","T__mcrn") ; `
     261; Reihe 2
     262PL_EDS("010",1,"q","Q","æ","S__PgUp","Æ","Ξ") ; q
     263PL_EDS("011",1,"w","W","å","U000008","Å" ,"√") ; w
     264PL_EDS("012",1,"e","E","ë","S____Up","Ë","Λ") ; e
     265PL_EDS("013",1,"r","R","ý","S___Del","Ý","ℂ") ; r
     266PL_EDS("014",1,"t","T","þ","S__PgDn","Þ","Ω") ; t
     267PL_EDS("015",1,"y","Y","ÿ","¡"      ,"Ÿ","×") ; z
     268PL_EDS("016",1,"u","U","ü","S__N__7","Ü","Ψ") ; u
     269PL_EDS("017",1,"i","I","ï","S__N__8","Ï","Γ") ; i
     270PL_EDS("018",1,"o","O","ö","S__N__9","Ö","Φ") ; o
     271PL_EDS("019",1,"p","P","œ","S__NAdd","Œ","ℚ") ; p
     272PL_EDS("01A",0,"[","{","«","−"      ,"‹","∘") ; ü
     273PL_EDS("01B",0,"]","}","»","T__dbac","›","T__brve") ; +
     274; Reihe 3
     275PL_EDS("01E",1,"a","A","ä","S__Home","Ä" ,"⊂") ; a
     276PL_EDS("01F",1,"s","S","ß","S__Left","§","∫") ; s
     277PL_EDS("020",1,"d","D","õ","S__Down","Ð","∀") ; d
     278PL_EDS("021",1,"f","F","è","S__Rght","È","∃") ; f
     279PL_EDS("022",1,"g","G","é","S___End","É","∈") ; g
     280PL_EDS("023",1,"h","H","ù","¿"      ,"Ù","Σ") ; h
     281PL_EDS("024",1,"j","J","ú","S__N__4","Ú","ℕ") ; j
     282PL_EDS("025",1,"k","K","ij","S__N__5","IJ","ℝ") ; k
     283PL_EDS("026",1,"l","L","ø","S__N__6","Ø","∂") ; l
     284PL_EDS("027",0,";",":","T__drss","S__NDot","·","Δ") ; ö
     285PL_EDS("028",0,"'","""","T__acut","."      ,"†","∇") ; ä
     286PL_EDS("02B",0,"\","|"  ,"¬"     ,"" ,"¦","") ; #
     287; Reihe 4
     288PL_EDS("02C",1,"z","Z","à","U00001B","À" ,"∪") ; y
     289PL_EDS("02D",1,"x","X","á","U000009","Á","∩") ; x
     290PL_EDS("02E",1,"c","C","ç","S___Ins","Ç","ℵ") ; c
     291PL_EDS("02F",1,"v","V","ì","U00000D","Ì","Π") ; v
     292PL_EDS("030",1,"b","B","í",""      ,"Í","ℤ") ; b
     293PL_EDS("031",1,"n","N","ñ",":"      ,"Ñ","⇐") ; n
     294PL_EDS("032",1,"m","M","Ω","S__N__1","√","⇔") ; m
     295PL_EDS("033",0,",","<","ò","S__N__2","Ò","⇒") ; ,
     296PL_EDS("034",0,".",">","ó","S__N__3","Ó","↦") ; .
     297PL_EDS("035",0,"/","?","¿",";"      ,"…","Θ") ; -
     298
     299; other keys
     300PL_Backup("space")
     301PL_Backup("esc"  )
     302PL_Backup("tab"  )
     303PL_Backup("F1"   )
     304PL_Backup("F2"   )
     305PL_Backup("F3"   )
     306PL_Backup("F4"   )
     307PL_Backup("F5"   )
     308PL_Backup("F6"   )
     309PL_Backup("F7"   )
     310PL_Backup("F8"   )
     311PL_Backup("F9"   )
     312PL_Backup("F10"  )
     313PL_Backup("F11"  )
     314PL_Backup("F12"  )
     315PL_Backup("enter")
     316
     317; Die Modifier
     318;ED1S("02A","P__M2LD") ; Mod2L (ShiftL)
     319;ED1S("136","P__M2RD") ; Mod2R (ShiftR)
     320;ED1S("03A","P__M3LD") ; Mod3L (CapsLock)
     321PL_EDS("056",0,"P__M4LD","P__M4LD","P__M4LD","P__M4LD","P__M4LD","P__M4LD") ; Mod4L (<>)
     322PL_EDS("138",0,"P__M3RD","P__M3RD","P__M3RD","P__M3RD","P__M3RD","P__M3RD") ; Mod3R (AltGr)
     323}
     324
     325CharProcProgT0() {
     326  ; Tastaturbelegungsvariante deaktivieren
     327  thekeys() ; restore key behaviors
     328  PL_RestoreAll()
     329  POList := ""
     330}
     331
     332CharProcProgTs() {
     333  global
     334
     335  if (isProgrammer == 0)
     336    IniDelete,%ini%,Global,isProgrammer
     337  else
     338    IniWrite,%isProgrammer%,%ini%,Global,isProgrammer
     339
     340  if ErrorLevel
     341    TrayTip,Programmer-Belegungsvariante,Beim Speichern der Variante ist ein Fehler aufgetreten.,10,1
     342  else if (zeigeModusBox)
     343    TrayTip,Programmer-Belegungsvariante,Variante gespeichert.,10,1
     344}
     345
     346ActivateProgTast() {
     347  global
     348
     349  CP3F5  := "PProgTt" ; M3+F5: Aktiviere/Deaktiviere Programmer
     350  CP3F4  := "PProgTs" ; M3+F4: Speichere Programmer
     351
     352  IniRead,isProgrammer,%ini%,Global,isProgrammer,0
     353  if (isProgrammer == 1)
     354    CharProcProgT1()
     355  else if (isProgrammer == 2)
     356    CharProcProgT2()
     357}
     358
     359ActivateProgTast()