annotate libgui/src/m-editor/marker.cc @ 21158:65827e9cccb8

Gui support for enhancement of dbstop. * octave-qscintilla.cc (contextMenuEvent): Capture right-click in the left margins to show a context menu for "dbstop if...". * octave-qscintilla.{cc,h} (contextmenu_break_condition): new function * file-editor-interface.h: pass condition to handle_update_breakpoint_marker_request * file-editor-tab.{cc,h}: (file_editor_tab, bp_info, handle_request_add_breakpoint, next_breakpoint, previous_breakpoint, do_breakpoint_marker, add_breakpoint_callback): Allow conditional breakpoint markers * file-editor-tab.cc (handle_context_menu_break_condition): new function * file-editor.{cc,h} (request_open_file, add_file_editor_tab, handle_delete_debugger_pointer_request): pass bp conditions. * marker.{cc,h} (marker, construct, handle_report_editor_linenr): pass breakpoint conditions * main-window.{cc,h} (handle_update_breakpoint_marker_request): pass breakpoint condition. * octave-link.h (update_breakpoint): pass breakpoint condition. * octave-qt-link.{cc,h} (do_update_breakpoint): pass breakpoint condition.
author Lachlan Andrew <lachlanbis@gmail.com>
date Sat, 30 Jan 2016 10:13:34 +1100
parents ea50940c362f
children 40de9f8f23a6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
21009
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
1 /*
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
2
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
3 Copyright (C) 2015 Daniel J. Sebald
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
4
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
5 This file is part of Octave.
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
6
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
10 option) any later version.
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
11
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
15 for more details.
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
16
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
18 along with Octave; see the file COPYING. If not, see
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
19 <http://www.gnu.org/licenses/>.
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
20
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
21 */
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
22
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
23 #ifdef HAVE_CONFIG_H
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
24 #include <config.h>
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
25 #endif
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
26
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
27 #ifdef HAVE_QSCINTILLA
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
28
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
29 #include <stdio.h>
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
30
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
31 #include "marker.h"
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
32
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
33
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
34 marker::marker (QsciScintilla *area, int original_linenr, editor_markers type,
21158
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
35 int editor_linenr, const QString& condition) : QObject ()
21009
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
36 {
21158
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
37 construct (area, original_linenr, type, editor_linenr, condition);
21009
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
38 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
39
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
40
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
41 marker::marker (QsciScintilla *area, int original_linenr,
21158
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
42 editor_markers type, const QString& condition) : QObject ()
21009
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
43 {
21158
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
44 construct (area, original_linenr, type, original_linenr - 1, condition);
21009
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
45 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
46
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
47
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
48 marker::~marker (void)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
49 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
50 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
51
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
52
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
53 void
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
54 marker::construct (QsciScintilla *area, int original_linenr,
21158
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
55 editor_markers type, int editor_linenr,
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
56 const QString& condition)
21009
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
57 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
58 _edit_area = area;
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
59 _original_linenr = original_linenr;
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
60 _marker_type = type;
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
61 _mhandle = _edit_area->markerAdd (editor_linenr, _marker_type);
21158
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
62 _condition = condition;
21009
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
63 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
64
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
65
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
66 void
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
67 marker::handle_remove_via_original_linenr (int linenr)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
68 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
69 if (_original_linenr == linenr)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
70 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
71 _edit_area->markerDeleteHandle(_mhandle);
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
72 delete this;
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
73 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
74 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
75
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
76
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
77 void
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
78 marker::handle_request_remove_via_editor_linenr (int linenr)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
79 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
80 // Get line number from the edit area and if it matches
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
81 // the requested line number, remove.
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
82 if (_edit_area->markerLine (_mhandle) == linenr)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
83 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
84 // Rather than delete editor marker directly, issue command
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
85 // to Octave core. Octave core should signal back to remove
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
86 // this breakpoint via debugger line number.
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
87 emit request_remove (_original_linenr);
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
88 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
89 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
90
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
91
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
92 void
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
93 marker::handle_remove (void)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
94 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
95 _edit_area->markerDeleteHandle (_mhandle);
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
96 delete this;
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
97 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
98
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
99
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
100 void
21158
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
101 marker::handle_find_translation (int linenr, int& translation_linenr,
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
102 marker *& bp)
21009
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
103 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
104 if (_original_linenr == linenr)
21158
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
105 {
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
106 translation_linenr = _edit_area->markerLine (_mhandle);
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
107 bp = this;
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
108 }
21009
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
109 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
110
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
111
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
112 void
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
113 marker::handle_find_just_before (int linenr, int& original_linenr, int& editor_linenr)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
114 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
115 if (_original_linenr < linenr && _original_linenr >= original_linenr)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
116 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
117 original_linenr = _original_linenr;
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
118 editor_linenr = _edit_area->markerLine (_mhandle);
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
119 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
120 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
121
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
122
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
123 void
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
124 marker::handle_find_just_after (int linenr, int& original_linenr, int& editor_linenr)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
125 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
126 if (_original_linenr > linenr && _original_linenr <= original_linenr)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
127 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
128 original_linenr = _original_linenr;
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
129 editor_linenr = _edit_area->markerLine (_mhandle);
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
130 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
131 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
132
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
133
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
134 void
21158
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
135 marker::handle_report_editor_linenr (QIntList& lines, QStringList& conditions)
21009
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
136 {
21158
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
137 lines << _edit_area->markerLine (_mhandle);
65827e9cccb8 Gui support for enhancement of dbstop.
Lachlan Andrew <lachlanbis@gmail.com>
parents: 21009
diff changeset
138 conditions << _condition;
21009
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
139 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
140
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
141
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
142 void
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
143 marker::handle_marker_line_deleted (int mhandle)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
144 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
145 // FUTURE SUPPORT: There really should be a signal in QsciScintilla
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
146 // called markerLineDeleted (int mhandle) because there is no way
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
147 // of knowing this. QsciScintilla will place the marker at a
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
148 // different line rather than remove it from the margin. I (DJS) will
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
149 // lobby for such a signal.
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
150 if (_mhandle == mhandle)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
151 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
152 if (_marker_type == breakpoint || _marker_type == debugger_position)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
153 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
154 int editor_linenr = _edit_area->markerLine (_mhandle);
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
155 _edit_area->markerDeleteHandle(_mhandle);
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
156 _marker_type = _marker_type == breakpoint ? unsure_breakpoint
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
157 : unsure_debugger_position;
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
158 _mhandle = _edit_area->markerAdd (editor_linenr, _marker_type);
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
159 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
160 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
161 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
162
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
163
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
164 void
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
165 marker::handle_marker_line_undeleted (int mhandle)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
166 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
167 // FUTURE SUPPORT: There really should be a signal in QsciScintilla
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
168 // called markerLineUndeleted (int mhandle) because there is no way
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
169 // of knowing this. QsciScintilla will place the marker at a
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
170 // different line rather than remove it from the margin. I (DJS) will
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
171 // lobby for such a signal.
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
172 if (_mhandle == mhandle)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
173 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
174 if (_marker_type == unsure_breakpoint || _marker_type == unsure_debugger_position)
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
175 {
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
176 int editor_linenr = _edit_area->markerLine (_mhandle);
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
177 _edit_area->markerDeleteHandle(_mhandle);
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
178 _marker_type = _marker_type == unsure_breakpoint ? breakpoint
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
179 : debugger_position;
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
180 _mhandle = _edit_area->markerAdd (editor_linenr, _marker_type);
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
181 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
182 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
183 }
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
184
ea50940c362f added missing files for cset 0a09c3cae800 (bug #46779)
Torsten <ttl@justmail.de>
parents:
diff changeset
185 #endif