Skip to content

Debugger in separate window #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
podgorskiy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Debugger in separate window #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37a9a71
Added option to launch debugger in separate window
Nov 9, 2015
761c521
Fixed y0-values in comment
Nov 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions SublimeGDB.sublime-settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,20 @@
]
},

"debugger_in_separate_window": true,

"separate_window_layout":
{
"cols": [0.0, 0.33, 0.66, 1.0],
"rows": [0.0, 1.0],
"cells":
[ // c1 r1 c2 r2
[0, 0, 1, 1], // -> (0.00, 0.0), (0.33, 1.00)
[1, 0, 2, 1], // -> (0.33, 0.0), (0.66, 1.00)
[2, 0, 3, 1] // -> (0.66, 0.0), (1.00, 1.00)
]
},

// visual stuff
"breakpoint_scope": "keyword.gdb",
"breakpoint_icon": "circle",
Expand Down
98 changes: 73 additions & 25 deletions sublimegdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ def expand_path(value, window):
gdb_cursor_position = 0
gdb_last_cursor_view = None
gdb_bkp_layout = {}
gdb_bkp_window = None
gdb_editor_window = None
gdb_debugger_window = None
gdb_bkp_view = None

gdb_shutting_down = False
Expand All @@ -141,6 +142,24 @@ def expand_path(value, window):
result_regex = re.compile("(?<=\^)[^,\"]*")
collapse_regex = re.compile("{.*}", re.DOTALL)

def get_debugger_window():
global gdb_debugger_window
if(get_setting("debugger_in_separate_window", True)):
return gdb_debugger_window
else:
sublime.active_window()

def get_editor_window():
global gdb_editor_window
if(get_setting("debugger_in_separate_window", True)):
return gdb_editor_window
else:
sublime.active_window()

def get_group_index_offset():
if(get_setting("debugger_in_separate_window", True)):
return 1
return 0

def normalize(filename):
if filename is None:
Expand Down Expand Up @@ -187,13 +206,13 @@ def open_at_start(self):
def open(self):
if self.view is None or self.view.window() is None:
if self.settingsprefix is not None:
sublime.active_window().focus_group(get_setting("%s_group" % self.settingsprefix, 0))
get_debugger_window().focus_group(get_setting("%s_group" % self.settingsprefix, 0) - get_group_index_offset())
self.create_view()

def close(self):
if self.view is not None:
if self.settingsprefix is not None:
sublime.active_window().focus_group(get_setting("%s_group" % self.settingsprefix, 0))
get_debugger_window().focus_group(get_setting("%s_group" % self.settingsprefix, 0) - get_group_index_offset())
self.destroy_view()

def should_update(self):
Expand Down Expand Up @@ -250,7 +269,7 @@ def clear(self, now=False):
self.do_clear(None)

def create_view(self):
self.view = sublime.active_window().new_file()
self.view = get_debugger_window().new_file()
self.view.set_name(self.name)
self.view.set_scratch(True)
self.view.set_read_only(True)
Expand All @@ -260,8 +279,8 @@ def create_view(self):
self.closed = False

def destroy_view(self):
sublime.active_window().focus_view(self.view)
sublime.active_window().run_command("close")
get_debugger_window().focus_view(self.view)
get_debugger_window().run_command("close")
self.view = None
self.closed = True

Expand Down Expand Up @@ -410,7 +429,7 @@ def find(self, name):
return None

def edit(self):
sublime.active_window().show_input_panel("%s =" % self["exp"], self.valuepair["value"], self.edit_on_done, None, None)
get_debugger_window().show_input_panel("%s =" % self["exp"], self.valuepair["value"], self.edit_on_done, None, None)

def get_name(self):
return self.valuepair["name"]
Expand Down Expand Up @@ -543,7 +562,7 @@ def edit_on_done(self, val):
gdb_register_view.update_values()

def edit(self):
sublime.active_window().show_input_panel("$%s =" % self.name, self.value, self.edit_on_done, None, None)
get_debugger_window().show_input_panel("$%s =" % self.name, self.value, self.edit_on_done, None, None)


class GDBRegisterView(GDBView):
Expand Down Expand Up @@ -1229,7 +1248,7 @@ def open(self):

def update_view_markers(view=None):
if view is None:
view = sublime.active_window().active_view()
view = get_editor_window().active_view()

fn = view.file_name()
if fn is not None:
Expand Down Expand Up @@ -1342,8 +1361,8 @@ def update_cursor():
if "fullname" in currFrame:
gdb_cursor = currFrame["fullname"]
gdb_cursor_position = int(currFrame["line"])
sublime.active_window().focus_group(get_setting("file_group", 0))
sublime.active_window().open_file("%s:%d" % (gdb_cursor, gdb_cursor_position), sublime.ENCODED_POSITION)
get_editor_window().focus_group(get_setting("file_group", 0))
get_editor_window().open_file("%s:%d" % (gdb_cursor, gdb_cursor_position), sublime.ENCODED_POSITION)
else:
gdb_cursor_position = 0

Expand Down Expand Up @@ -1437,8 +1456,10 @@ def cleanup():
for view in gdb_views:
view.close()
if get_setting("push_pop_layout", True):
gdb_bkp_window.set_layout(gdb_bkp_layout)
gdb_bkp_window.focus_view(gdb_bkp_view)
gdb_editor_window.set_layout(gdb_bkp_layout)
gdb_editor_window.focus_view(gdb_bkp_view)
if(get_setting("debugger_in_separate_window", True)):
get_debugger_window().run_command("close")
if __debug_file_handle is not None:
if __debug_file_handle != sys.stdout:
__debug_file_handle.close()
Expand Down Expand Up @@ -1580,7 +1601,8 @@ def run(self):
global gdb_process
global gdb_server_process
global gdb_run_status
global gdb_bkp_window
global gdb_debugger_window
global gdb_editor_window
global gdb_bkp_view
global gdb_bkp_layout
global gdb_shutting_down
Expand Down Expand Up @@ -1637,20 +1659,46 @@ def run(self):
stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)

log_debug("Process: %s\n" % gdb_process)
gdb_bkp_window = sublime.active_window()
gdb_editor_window = sublime.active_window()
if(get_setting("debugger_in_separate_window", True)):
sublime.run_command("new_window")
gdb_debugger_window = sublime.active_window()
#back up current layout before opening the debug one
#it will be restored when debug is finished
gdb_bkp_layout = gdb_bkp_window.get_layout()
gdb_bkp_view = gdb_bkp_window.active_view()
gdb_bkp_window.set_layout(
get_setting("layout",
{
"cols": [0.0, 0.5, 1.0],
"rows": [0.0, 0.75, 1.0],
"cells": [[0, 0, 2, 1], [0, 1, 1, 2], [1, 1, 2, 2]]
}
gdb_bkp_layout = gdb_debugger_window.get_layout()
gdb_bkp_view = gdb_debugger_window.active_view()

if(get_setting("debugger_in_separate_window", True)):
gdb_debugger_window.set_layout(
get_setting("separate_window_layout",
{
"cols": [0.0, 0.33, 0.66, 1.0],
"rows": [0.0, 1.0],
"cells":
[
[0, 0, 1, 1],
[1, 0, 2, 1],
[2, 0, 3, 1]
]
}
)
)
else:
gdb_debugger_window.set_layout(
get_setting("layout",
{
"cols": [0.0, 0.33, 0.66, 1.0],
"rows": [0.0, 0.75, 1.0],
"cells":
[ # c1 r1 c2 r2
[0, 0, 3, 1], # -> (0.00, 0.00), (1.00, 0.75)
[0, 1, 1, 2], # -> (0.00, 0.75), (0.33, 1.00)
[1, 1, 2, 2], # -> (0.33, 0.75), (0.66, 1.00)
[2, 1, 3, 2] # -> (0.66, 0.75), (1.00, 1.00)
]
}
)
)
)

for view in gdb_views:
if view.is_closed() and view.open_at_start():
Expand Down