~gnome15-team/gnome15/trunk

« back to all changes in this revision

Viewing changes to gnome15/src/main/python/gnome15/drivers/driver_g15direct.py

  • Committer: tanktarta
  • Date: 2012-11-24 10:27:36 UTC
  • Revision ID: tanktarta-20121124102736-0drhasy3jdn862wx
0.9.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
445
445
        if logger.isEnabledFor(logging.DEBUG):
446
446
            logger.debug("Key code %d" % code)
447
447
            
 
448
        has_js = ext_code & EXT_KEY_MAP[g15driver.G_KEY_JOY] > 0
 
449
        if has_js:
 
450
            ext_code -= EXT_KEY_MAP[g15driver.G_KEY_JOY]
 
451
            
448
452
        this_keys = [] if code == 0 else self._convert_from_g15daemon_code(code)
449
453
        if ext_code > 0 and self.get_model_name() == g15driver.MODEL_G510:
450
454
            this_keys += self._get_g510_multimedia_keys(ext_code)
451
455
        elif ext_code > 0:
452
456
            this_keys += self._convert_ext_g15daemon_code(ext_code)
453
457
        
454
 
        if self.get_model_name() == g15driver.MODEL_G13 and self.has_joystick_key(this_keys):
 
458
        if self.get_model_name() == g15driver.MODEL_G13 and has_js:
455
459
            c = self.analogue_calibration if self.joy_mode in [ "joystick", "mouse" ] else self.digital_calibration
456
460
            
457
461
            low_val = 128 - c
458
462
            high_val = 128 + c
459
463
            max_step = 5
460
464
                
461
 
            if g15driver.G_KEY_JOY in this_keys:
462
 
                this_keys.remove(g15driver.G_KEY_JOY)
463
465
            pos = pylibg15.get_joystick_position()
464
466
            
465
467
            if logger.isEnabledFor(logging.DEBUG):
470
472
            elif self.joy_mode == "mouse":
471
473
                self._rel_mouse(this_keys, pos, low_val, high_val, max_step)                 
472
474
            else:
473
 
                self._emit_macro_keys(this_keys, pos, low_val, high_val)            
 
475
                self._emit_macro_keys(this_keys, pos, low_val, high_val)
474
476
        
475
477
        up = []
476
478
        down = []