← Back to branch summary

~gcrosswhite/leo-editor/ran-setup-through-2to3

« back to all changes in this revision

Viewing changes to leo/core/leoKeys.py

  • Committer: Edward K. Ream
  • Date: 2011-06-06 20:16:21 UTC
  • Revision ID: edreamleo@gmail.com-20110606201621-prug8gz4wt1mrzom
Eliminate stroke arg to k.masterKeyHander: a good simplification for macros.

Show diffs side-by-side

added added

removed removed

Lines of Context:
leo/core/leoKeys.py
1927
1927
        # This is the only real key callback.
1928
1928
        def masterBindKeyCallback (event,k=k,stroke=stroke):
1929
1929
            # g.trace(stroke,event.w)
1930
 
            return k.masterKeyHandler(event,stroke=stroke)
1931
 
 
1932
 
        if 0:
1933
 
            if stroke.lower().endswith('+s') or stroke.lower().endswith('-s'):
1934
 
                g.trace(sroke,widgets)
1935
 
            if stroke in ('s','S'):
1936
 
                g.trace(stroke,widgets)
 
1930
            return k.masterKeyHandler(event) # ,stroke=stroke)
1937
1931
 
1938
1932
        for w in widgets:
1939
1933
            if not w: continue
2801
2795
    #@+node:ekr.20061031131434.146: *4* masterKeyHandler & helpers
2802
2796
    master_key_count = 0
2803
2797
 
2804
 
    def masterKeyHandler (self,event,stroke=None):
 
2798
    def masterKeyHandler (self,event): ###,stroke=None):
2805
2799
 
2806
2800
        '''This is the handler for almost all key bindings.'''
2807
2801
        
3197
3191
        c.check_event(event)
3198
3192
 
3199
3193
        if stroke:
3200
 
            return k.masterKeyHandler(event,stroke=stroke)
 
3194
            return k.masterKeyHandler(event) ##,stroke=stroke)
3201
3195
        else:
3202
3196
            return k.masterCommand(event,func,stroke,commandName)
3203
3197
    #@+node:ekr.20061031170011.3: *3* k.Minibuffer
4433
4427
                    k.masterCommand(event,stroke)
4434
4428
            else:
4435
4429
                for z in range(n):
4436
 
                    k.masterKeyHandler(event,stroke=stroke) ###
 
4430
                    k.masterKeyHandler(event) ## ,stroke=stroke)
4437
4431
    #@+node:ekr.20061031131434.203: *4* doControlU
4438
4432
    def doControlU (self,event,stroke):
4439
4433