Most of the pep8 changes finished. Be careful, things may be horribly broken.
This commit is contained in:
Storm Dragon
@ -7,14 +7,14 @@
|
||||
from fenrirscreenreader.core import debug
|
||||
|
||||
|
||||
class cursorManager():
|
||||
class CursorManager():
|
||||
def __init__(self):
|
||||
pass
|
||||
|
||||
def initialize(self, environment):
|
||||
self.env = environment
|
||||
|
||||
def shouldProcessNumpadCommands(self):
|
||||
def should_process_numpad_commands(self):
|
||||
"""
|
||||
Check if numpad commands should be processed based on numlock state
|
||||
Return True if numlock is OFF (commands should work)
|
||||
@ -26,88 +26,88 @@ class cursorManager():
|
||||
def shutdown(self):
|
||||
pass
|
||||
|
||||
def clearMarks(self):
|
||||
def clear_marks(self):
|
||||
self.env['commandBuffer']['Marks']['1'] = None
|
||||
self.env['commandBuffer']['Marks']['2'] = None
|
||||
|
||||
def isMarkSet(self):
|
||||
def is_mark_set(self):
|
||||
return self.env['commandBuffer']['Marks']['1'] is not None
|
||||
|
||||
def isSingleMark(self):
|
||||
def is_single_mark(self):
|
||||
return self.env['commandBuffer']['Marks']['1'] is not None and \
|
||||
self.env['commandBuffer']['Marks']['2'] is None
|
||||
|
||||
def isMultibleMark(self):
|
||||
def is_multible_mark(self):
|
||||
return self.env['commandBuffer']['Marks']['1'] is not None and \
|
||||
self.env['commandBuffer']['Marks']['2'] is not None
|
||||
|
||||
def setMark(self):
|
||||
currCursor = None
|
||||
def set_mark(self):
|
||||
curr_cursor = None
|
||||
if self.env['screen']['newCursorReview']:
|
||||
currCursor = self.env['screen']['newCursorReview'].copy()
|
||||
curr_cursor = self.env['screen']['newCursorReview'].copy()
|
||||
else:
|
||||
currCursor = self.env['screen']['newCursor'].copy()
|
||||
curr_cursor = self.env['screen']['new_cursor'].copy()
|
||||
if not self.env['commandBuffer']['Marks']['1']:
|
||||
self.env['commandBuffer']['Marks']['1'] = currCursor.copy()
|
||||
self.env['commandBuffer']['Marks']['1'] = curr_cursor.copy()
|
||||
return 1
|
||||
else:
|
||||
self.env['commandBuffer']['Marks']['2'] = currCursor.copy()
|
||||
self.env['commandBuffer']['Marks']['2'] = curr_cursor.copy()
|
||||
return 2
|
||||
return 0
|
||||
|
||||
def getReviewOrTextCursor(self):
|
||||
def get_review_or_text_cursor(self):
|
||||
if self.env['screen']['newCursorReview']:
|
||||
return self.env['screen']['newCursorReview'].copy()
|
||||
else:
|
||||
return self.env['screen']['newCursor'].copy()
|
||||
return self.env['screen']['new_cursor'].copy()
|
||||
|
||||
def clearReviewCursor(self):
|
||||
if not self.isReviewMode():
|
||||
def clear_review_cursor(self):
|
||||
if not self.is_review_mode():
|
||||
return
|
||||
self.env['screen']['oldCursorReview'] = None
|
||||
self.env['screen']['newCursorReview'] = None
|
||||
|
||||
def isCursorHorizontalMove(self):
|
||||
return self.env['screen']['newCursor']['x'] != self.env['screen']['oldCursor']['x']
|
||||
def is_cursor_horizontal_move(self):
|
||||
return self.env['screen']['new_cursor']['x'] != self.env['screen']['old_cursor']['x']
|
||||
|
||||
def isCursorVerticalMove(self):
|
||||
return self.env['screen']['newCursor']['y'] != self.env['screen']['oldCursor']['y']
|
||||
def is_cursor_vertical_move(self):
|
||||
return self.env['screen']['new_cursor']['y'] != self.env['screen']['old_cursor']['y']
|
||||
|
||||
def isReviewMode(self):
|
||||
def is_review_mode(self):
|
||||
return self.env['screen']['newCursorReview'] is not None
|
||||
|
||||
def enterReviewModeCurrTextCursor(self, overwrite=False):
|
||||
if self.isReviewMode() and not overwrite:
|
||||
def enter_review_mode_curr_text_cursor(self, overwrite=False):
|
||||
if self.is_review_mode() and not overwrite:
|
||||
return
|
||||
self.env['screen']['oldCursorReview'] = self.env['screen']['newCursorReview']
|
||||
if not self.env['screen']['newCursorReview']:
|
||||
self.env['screen']['newCursorReview'] = self.env['screen']['newCursor'].copy()
|
||||
if self.env['runtime']['settingsManager'].getSettingAsBool(
|
||||
self.env['screen']['newCursorReview'] = self.env['screen']['new_cursor'].copy()
|
||||
if self.env['runtime']['SettingsManager'].get_setting_as_bool(
|
||||
'focus',
|
||||
'highlight') and self.env['runtime']['attributeManager'].isAttributeCursorActive():
|
||||
self.env['screen']['newCursorReview'] = self.env['runtime']['attributeManager'].getCurrAttributeCursor(
|
||||
'highlight') and self.env['runtime']['AttributeManager'].is_attribute_cursor_active():
|
||||
self.env['screen']['newCursorReview'] = self.env['runtime']['AttributeManager'].get_curr_attribute_cursor(
|
||||
).copy()
|
||||
|
||||
def setReviewCursorPosition(self, x, y):
|
||||
if not self.isReviewMode():
|
||||
self.enterReviewModeCurrTextCursor()
|
||||
def set_review_cursor_position(self, x, y):
|
||||
if not self.is_review_mode():
|
||||
self.enter_review_mode_curr_text_cursor()
|
||||
self.env['screen']['oldCursorReview'] = self.env['screen']['newCursorReview']
|
||||
self.env['screen']['newCursorReview']['x'] = x
|
||||
self.env['screen']['newCursorReview']['y'] = y
|
||||
|
||||
def isApplicationWindowSet(self):
|
||||
def is_application_window_set(self):
|
||||
try:
|
||||
currApp = self.env['runtime']['applicationManager'].getCurrentApplication(
|
||||
curr_app = self.env['runtime']['ApplicationManager'].get_current_application(
|
||||
)
|
||||
if self.env['commandBuffer']['windowArea'][currApp]['1'] is not None:
|
||||
if self.env['commandBuffer']['windowArea'][curr_app]['1'] is not None:
|
||||
return True
|
||||
except Exception as e:
|
||||
self.env['runtime']['debug'].writeDebugOut(
|
||||
'cursorManager isApplicationWindowSet: Error checking window area: ' + str(e),
|
||||
debug.debugLevel.ERROR)
|
||||
self.env['runtime']['DebugManager'].write_debug_out(
|
||||
'CursorManager is_application_window_set: Error checking window area: ' + str(e),
|
||||
debug.DebugLevel.ERROR)
|
||||
return False
|
||||
|
||||
def setWindowForApplication(self, start=None, end=None):
|
||||
def set_window_for_application(self, start=None, end=None):
|
||||
x1 = 0
|
||||
x2 = 0
|
||||
y1 = 0
|
||||
@ -125,36 +125,36 @@ class cursorManager():
|
||||
if not self.env['commandBuffer']['Marks']['2']:
|
||||
return False
|
||||
else:
|
||||
x1 = self.env['commandBuffer']['Marks']['2']['x']
|
||||
y1 = self.env['commandBuffer']['Marks']['2']['y']
|
||||
x2 = self.env['commandBuffer']['Marks']['2']['x']
|
||||
y2 = self.env['commandBuffer']['Marks']['2']['y']
|
||||
else:
|
||||
x1 = start['x']
|
||||
y1 = start['y']
|
||||
x2 = end['x']
|
||||
y2 = end['y']
|
||||
|
||||
currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
|
||||
self.env['commandBuffer']['windowArea'][currApp] = {}
|
||||
curr_app = self.env['runtime']['ApplicationManager'].get_current_application()
|
||||
self.env['commandBuffer']['windowArea'][curr_app] = {}
|
||||
|
||||
if x1 * y1 <= \
|
||||
x2 * y2:
|
||||
self.env['commandBuffer']['windowArea'][currApp]['1'] = {
|
||||
self.env['commandBuffer']['windowArea'][curr_app]['1'] = {
|
||||
'x': x1, 'y': y1}
|
||||
self.env['commandBuffer']['windowArea'][currApp]['2'] = {
|
||||
self.env['commandBuffer']['windowArea'][curr_app]['2'] = {
|
||||
'x': x2, 'y': y2}
|
||||
else:
|
||||
self.env['commandBuffer']['windowArea'][currApp]['1'] = {
|
||||
self.env['commandBuffer']['windowArea'][curr_app]['1'] = {
|
||||
'x': x2, 'y': y2}
|
||||
self.env['commandBuffer']['windowArea'][currApp]['2'] = {
|
||||
self.env['commandBuffer']['windowArea'][curr_app]['2'] = {
|
||||
'x': x1, 'y': y1}
|
||||
return True
|
||||
|
||||
def clearWindowForApplication(self):
|
||||
currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
|
||||
def clear_window_for_application(self):
|
||||
curr_app = self.env['runtime']['ApplicationManager'].get_current_application()
|
||||
try:
|
||||
del self.env['commandBuffer']['windowArea'][currApp]
|
||||
del self.env['commandBuffer']['windowArea'][curr_app]
|
||||
except Exception as e:
|
||||
self.env['runtime']['debug'].writeDebugOut(
|
||||
'cursorManager clearWindowForApplication: Error clearing window area: ' +
|
||||
self.env['runtime']['DebugManager'].write_debug_out(
|
||||
'CursorManager clear_window_for_application: Error clearing window area: ' +
|
||||
str(e),
|
||||
debug.debugLevel.ERROR)
|
||||
debug.DebugLevel.ERROR)
|
||||
return False
|
||||
return True
|
||||
|
||||
Reference in New Issue
Block a user