author | wenzelm |
Tue, 21 Oct 2014 15:21:44 +0200 | |
changeset 58748 | 8f92f17d8781 |
parent 57612 | 990ffb84489b |
child 59129 | 6959ceb53ac8 |
permissions | -rw-r--r-- |
43282
5d294220ca43
moved sources -- eliminated Netbeans artifact of jedit package directory;
wenzelm
parents:
42839
diff
changeset
|
1 |
/* Title: Tools/jEdit/src/document_view.scala |
36760 | 2 |
Author: Fabian Immler, TU Munich |
3 |
Author: Makarius |
|
4 |
||
5 |
Document view connected to jEdit text area. |
|
6 |
*/ |
|
34408 | 7 |
|
34403
6c812a3cb170
information on command-phase left of scrollbar (with panel)
immler@in.tum.de
parents:
diff
changeset
|
8 |
package isabelle.jedit |
6c812a3cb170
information on command-phase left of scrollbar (with panel)
immler@in.tum.de
parents:
diff
changeset
|
9 |
|
34760 | 10 |
|
36015 | 11 |
import isabelle._ |
12 |
||
54441 | 13 |
import java.awt.Graphics2D |
53226
9cf8e2263ca7
more systematic JEdit_Lib.key_listener with optional KeyEventWorkaround;
wenzelm
parents:
53179
diff
changeset
|
14 |
import java.awt.event.KeyEvent |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
15 |
import javax.swing.event.{CaretListener, CaretEvent} |
34734 | 16 |
|
54441 | 17 |
import org.gjt.sp.jedit.jEdit |
39176
b8fdd3ae8815
Document_View: more precise painting of gutter icons, only if line selection area is sufficiently large;
wenzelm
parents:
39175
diff
changeset
|
18 |
import org.gjt.sp.jedit.options.GutterOptionPane |
55712 | 19 |
import org.gjt.sp.jedit.textarea.{JEditTextArea, TextArea, TextAreaExtension, TextAreaPainter} |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
20 |
|
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
21 |
|
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
22 |
object Document_View |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
23 |
{ |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
24 |
/* document view of text area */ |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
25 |
|
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
26 |
private val key = new Object |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
27 |
|
55712 | 28 |
def apply(text_area: TextArea): Option[Document_View] = |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
29 |
{ |
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
56883
diff
changeset
|
30 |
GUI_Thread.require {} |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
31 |
text_area.getClientProperty(key) match { |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
32 |
case doc_view: Document_View => Some(doc_view) |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
33 |
case _ => None |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
34 |
} |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
35 |
} |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
36 |
|
39741
62b91eb2d39a
CONTROL-mouse management: handle windowIconified;
wenzelm
parents:
39740
diff
changeset
|
37 |
def exit(text_area: JEditTextArea) |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
38 |
{ |
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
56883
diff
changeset
|
39 |
GUI_Thread.require {} |
34788
3779c54a2d21
direct apply for Document_Model and Document_View;
wenzelm
parents:
34784
diff
changeset
|
40 |
apply(text_area) match { |
39636 | 41 |
case None => |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
42 |
case Some(doc_view) => |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
43 |
doc_view.deactivate() |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
44 |
text_area.putClientProperty(key, null) |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
45 |
} |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
46 |
} |
43397 | 47 |
|
48 |
def init(model: Document_Model, text_area: JEditTextArea): Document_View = |
|
49 |
{ |
|
50 |
exit(text_area) |
|
51 |
val doc_view = new Document_View(model, text_area) |
|
52 |
text_area.putClientProperty(key, doc_view) |
|
53 |
doc_view.activate() |
|
54 |
doc_view |
|
55 |
} |
|
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
56 |
} |
34403
6c812a3cb170
information on command-phase left of scrollbar (with panel)
immler@in.tum.de
parents:
diff
changeset
|
57 |
|
34733 | 58 |
|
43376
0f6880c1c759
some direct text foreground painting, instead of token marking;
wenzelm
parents:
43369
diff
changeset
|
59 |
class Document_View(val model: Document_Model, val text_area: JEditTextArea) |
34654 | 60 |
{ |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
61 |
private val session = model.session |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
62 |
|
50205 | 63 |
def get_rendering(): Rendering = Rendering(model.snapshot(), PIDE.options.value) |
49411 | 64 |
|
50306 | 65 |
val rich_text_area = |
50915
12de8ea66f54
close tooltip after Active.action, to make it look more interactive (notably due to lack of dynamic update);
wenzelm
parents:
50770
diff
changeset
|
66 |
new Rich_Text_Area(text_area.getView, text_area, get_rendering _, () => (), |
56883
38c6b70e5e53
common support for search field, which is actually a light-weight Highlighter;
wenzelm
parents:
56770
diff
changeset
|
67 |
() => None, caret_visible = true, enable_hovering = false) |
49411 | 68 |
|
34403
6c812a3cb170
information on command-phase left of scrollbar (with panel)
immler@in.tum.de
parents:
diff
changeset
|
69 |
|
44379 | 70 |
/* perspective */ |
71 |
||
54325
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
72 |
def perspective(snapshot: Document.Snapshot): Text.Perspective = |
44379 | 73 |
{ |
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
56883
diff
changeset
|
74 |
GUI_Thread.require {} |
53780
ef62204a126b
caret range of active text area counts as visible (e.g. relevant for Output after scrolling outside of text view);
wenzelm
parents:
53274
diff
changeset
|
75 |
|
54325
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
76 |
val active_command = |
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
77 |
{ |
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
78 |
val view = text_area.getView |
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
79 |
if (view != null && view.getTextArea == text_area) { |
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
80 |
PIDE.editor.current_command(view, snapshot) match { |
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
81 |
case Some(command) => |
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
82 |
snapshot.node.command_start(command) match { |
54530
2c1440f70028
ranges of thy_load commands count as visible within perspective;
wenzelm
parents:
54461
diff
changeset
|
83 |
case Some(start) => List(snapshot.convert(command.proper_range + start)) |
54325
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
84 |
case None => Nil |
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
85 |
} |
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
86 |
case None => Nil |
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
87 |
} |
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
88 |
} |
53780
ef62204a126b
caret range of active text area counts as visible (e.g. relevant for Output after scrolling outside of text view);
wenzelm
parents:
53274
diff
changeset
|
89 |
else Nil |
54325
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
90 |
} |
53780
ef62204a126b
caret range of active text area counts as visible (e.g. relevant for Output after scrolling outside of text view);
wenzelm
parents:
53274
diff
changeset
|
91 |
|
50363
2f8dc9e65401
tuned signature in accordance to document operations;
wenzelm
parents:
50306
diff
changeset
|
92 |
val buffer_range = JEdit_Lib.buffer_range(model.buffer) |
53780
ef62204a126b
caret range of active text area counts as visible (e.g. relevant for Output after scrolling outside of text view);
wenzelm
parents:
53274
diff
changeset
|
93 |
val visible_lines = |
ef62204a126b
caret range of active text area counts as visible (e.g. relevant for Output after scrolling outside of text view);
wenzelm
parents:
53274
diff
changeset
|
94 |
(for { |
56356
c3dbaa155ece
tuned for-comprehensions -- less structure mapping;
wenzelm
parents:
56314
diff
changeset
|
95 |
i <- (0 until text_area.getVisibleLines).iterator |
46997 | 96 |
start = text_area.getScreenLineStartOffset(i) |
97 |
stop = text_area.getScreenLineEndOffset(i) |
|
44379 | 98 |
if start >= 0 && stop >= 0 |
46997 | 99 |
range <- buffer_range.try_restrict(Text.Range(start, stop)) |
44583
022509c908fb
restrict perspective to actual buffer_range, to avoid spurious edits due to faulty last_exec_offset (NB: jEdit screenlines may be silently extended by trailing newline);
wenzelm
parents:
44473
diff
changeset
|
100 |
if !range.is_singularity |
44379 | 101 |
} |
53780
ef62204a126b
caret range of active text area counts as visible (e.g. relevant for Output after scrolling outside of text view);
wenzelm
parents:
53274
diff
changeset
|
102 |
yield range).toList |
ef62204a126b
caret range of active text area counts as visible (e.g. relevant for Output after scrolling outside of text view);
wenzelm
parents:
53274
diff
changeset
|
103 |
|
54325
2c4155003352
clarified Editor.current_command: allow outdated snapshot;
wenzelm
parents:
53780
diff
changeset
|
104 |
Text.Perspective(active_command ::: visible_lines) |
44379 | 105 |
} |
106 |
||
54461 | 107 |
private def update_view = new TextAreaExtension |
44437
bebe15799192
more reliable update_perspective handler based on actual text visibility (e.g. on startup or when resizing without scrolling);
wenzelm
parents:
44436
diff
changeset
|
108 |
{ |
bebe15799192
more reliable update_perspective handler based on actual text visibility (e.g. on startup or when resizing without scrolling);
wenzelm
parents:
44436
diff
changeset
|
109 |
override def paintScreenLineRange(gfx: Graphics2D, |
bebe15799192
more reliable update_perspective handler based on actual text visibility (e.g. on startup or when resizing without scrolling);
wenzelm
parents:
44436
diff
changeset
|
110 |
first_line: Int, last_line: Int, physical_lines: Array[Int], |
bebe15799192
more reliable update_perspective handler based on actual text visibility (e.g. on startup or when resizing without scrolling);
wenzelm
parents:
44436
diff
changeset
|
111 |
start: Array[Int], end: Array[Int], y: Int, line_height: Int) |
bebe15799192
more reliable update_perspective handler based on actual text visibility (e.g. on startup or when resizing without scrolling);
wenzelm
parents:
44436
diff
changeset
|
112 |
{ |
49424 | 113 |
// no robust_body |
54461 | 114 |
PIDE.editor.invoke() |
44437
bebe15799192
more reliable update_perspective handler based on actual text visibility (e.g. on startup or when resizing without scrolling);
wenzelm
parents:
44436
diff
changeset
|
115 |
} |
bebe15799192
more reliable update_perspective handler based on actual text visibility (e.g. on startup or when resizing without scrolling);
wenzelm
parents:
44436
diff
changeset
|
116 |
} |
bebe15799192
more reliable update_perspective handler based on actual text visibility (e.g. on startup or when resizing without scrolling);
wenzelm
parents:
44436
diff
changeset
|
117 |
|
44379 | 118 |
|
49411 | 119 |
/* gutter */ |
34513 | 120 |
|
42825 | 121 |
private val gutter_painter = new TextAreaExtension |
39175 | 122 |
{ |
123 |
override def paintScreenLineRange(gfx: Graphics2D, |
|
124 |
first_line: Int, last_line: Int, physical_lines: Array[Int], |
|
125 |
start: Array[Int], end: Array[Int], y: Int, line_height: Int) |
|
126 |
{ |
|
49411 | 127 |
rich_text_area.robust_body(()) { |
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
56883
diff
changeset
|
128 |
GUI_Thread.assert {} |
46920
5f44c8bea84e
more explicit indication of swing thread context;
wenzelm
parents:
46918
diff
changeset
|
129 |
|
43404 | 130 |
val gutter = text_area.getGutter |
131 |
val width = GutterOptionPane.getSelectionAreaWidth |
|
132 |
val border_width = jEdit.getIntegerProperty("view.gutter.borderWidth", 3) |
|
133 |
val FOLD_MARKER_SIZE = 12 |
|
43419
6ed49c52d463
flush snapshot on falling edge of is_outdated -- recover effect of former buffer.propertiesChanged on text area (cf. f0770743b7ec);
wenzelm
parents:
43417
diff
changeset
|
134 |
|
43404 | 135 |
if (gutter.isSelectionAreaEnabled && !gutter.isExpanded && width >= 12 && line_height >= 12) { |
49408 | 136 |
val buffer = model.buffer |
137 |
JEdit_Lib.buffer_lock(buffer) { |
|
49410
34acbcc33adf
tuned signature -- more general Text_Area_Painter operations;
wenzelm
parents:
49408
diff
changeset
|
138 |
val rendering = get_rendering() |
49356 | 139 |
|
43404 | 140 |
for (i <- 0 until physical_lines.length) { |
141 |
if (physical_lines(i) != -1) { |
|
49843
afddf4e26fac
further refinement of jEdit line range, avoiding lack of final \n;
wenzelm
parents:
49492
diff
changeset
|
142 |
val line_range = Text.Range(start(i), end(i)) |
43419
6ed49c52d463
flush snapshot on falling edge of is_outdated -- recover effect of former buffer.propertiesChanged on text area (cf. f0770743b7ec);
wenzelm
parents:
43417
diff
changeset
|
143 |
|
43404 | 144 |
// gutter icons |
56495 | 145 |
rendering.gutter_icon(line_range) match { |
46178
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
45744
diff
changeset
|
146 |
case Some(icon) => |
46227
4aa84f84d5e8
more precise rendering of overview_color/gutter_message/squiggly_underline based on cumulation of command status and warning/error messages;
wenzelm
parents:
46205
diff
changeset
|
147 |
val x0 = (FOLD_MARKER_SIZE + width - border_width - icon.getIconWidth) max 10 |
4aa84f84d5e8
more precise rendering of overview_color/gutter_message/squiggly_underline based on cumulation of command status and warning/error messages;
wenzelm
parents:
46205
diff
changeset
|
148 |
val y0 = y + i * line_height + (((line_height - icon.getIconHeight) / 2) max 0) |
4aa84f84d5e8
more precise rendering of overview_color/gutter_message/squiggly_underline based on cumulation of command status and warning/error messages;
wenzelm
parents:
46205
diff
changeset
|
149 |
icon.paintIcon(gutter, gfx, x0, y0) |
46178
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
45744
diff
changeset
|
150 |
case None => |
43404 | 151 |
} |
39175 | 152 |
} |
153 |
} |
|
154 |
} |
|
155 |
} |
|
156 |
} |
|
157 |
} |
|
158 |
} |
|
159 |
||
160 |
||
52479
bb516d01d259
more aggresive ESCAPE handling, while retaining its regular meaning for jEdit;
wenzelm
parents:
50915
diff
changeset
|
161 |
/* key listener */ |
bb516d01d259
more aggresive ESCAPE handling, while retaining its regular meaning for jEdit;
wenzelm
parents:
50915
diff
changeset
|
162 |
|
53226
9cf8e2263ca7
more systematic JEdit_Lib.key_listener with optional KeyEventWorkaround;
wenzelm
parents:
53179
diff
changeset
|
163 |
private val key_listener = |
9cf8e2263ca7
more systematic JEdit_Lib.key_listener with optional KeyEventWorkaround;
wenzelm
parents:
53179
diff
changeset
|
164 |
JEdit_Lib.key_listener( |
53227
68cc55ceb7f6
more standard key handling according to jEdit (with workaround);
wenzelm
parents:
53226
diff
changeset
|
165 |
key_pressed = (evt: KeyEvent) => |
53226
9cf8e2263ca7
more systematic JEdit_Lib.key_listener with optional KeyEventWorkaround;
wenzelm
parents:
53179
diff
changeset
|
166 |
{ |
53244 | 167 |
if (evt.getKeyCode == KeyEvent.VK_ESCAPE && PIDE.dismissed_popups(text_area.getView)) |
53226
9cf8e2263ca7
more systematic JEdit_Lib.key_listener with optional KeyEventWorkaround;
wenzelm
parents:
53179
diff
changeset
|
168 |
evt.consume |
53274
1760c01f1c78
maintain Completion_Popup.Text_Area as client property like Document_View;
wenzelm
parents:
53272
diff
changeset
|
169 |
} |
53226
9cf8e2263ca7
more systematic JEdit_Lib.key_listener with optional KeyEventWorkaround;
wenzelm
parents:
53179
diff
changeset
|
170 |
) |
52479
bb516d01d259
more aggresive ESCAPE handling, while retaining its regular meaning for jEdit;
wenzelm
parents:
50915
diff
changeset
|
171 |
|
bb516d01d259
more aggresive ESCAPE handling, while retaining its regular meaning for jEdit;
wenzelm
parents:
50915
diff
changeset
|
172 |
|
37129 | 173 |
/* caret handling */ |
34810 | 174 |
|
46740
852baa599351
explicitly revoke delay, to avoid spurious timer events after deactivation of related components;
wenzelm
parents:
46583
diff
changeset
|
175 |
private val delay_caret_update = |
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
56883
diff
changeset
|
176 |
GUI_Thread.delay_last(PIDE.options.seconds("editor_input_delay")) { |
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
177 |
session.caret_focus.post(Session.Caret_Focus) |
34810 | 178 |
} |
46740
852baa599351
explicitly revoke delay, to avoid spurious timer events after deactivation of related components;
wenzelm
parents:
46583
diff
changeset
|
179 |
|
852baa599351
explicitly revoke delay, to avoid spurious timer events after deactivation of related components;
wenzelm
parents:
46583
diff
changeset
|
180 |
private val caret_listener = new CaretListener { |
49195 | 181 |
override def caretUpdate(e: CaretEvent) { delay_caret_update.invoke() } |
34810 | 182 |
} |
183 |
||
184 |
||
46572 | 185 |
/* text status overview left of scrollbar */ |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
186 |
|
47993 | 187 |
private object overview extends Text_Overview(this) |
46572 | 188 |
{ |
46571
edcccd7a9eee
overview.delay_repaint: avoid wasting GUI cycles via update_delay;
wenzelm
parents:
46550
diff
changeset
|
189 |
val delay_repaint = |
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
56883
diff
changeset
|
190 |
GUI_Thread.delay_first(PIDE.options.seconds("editor_update_delay")) { repaint() } |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
191 |
} |
34403
6c812a3cb170
information on command-phase left of scrollbar (with panel)
immler@in.tum.de
parents:
diff
changeset
|
192 |
|
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
193 |
|
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
194 |
/* main */ |
39740 | 195 |
|
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
196 |
private val main = |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
197 |
Session.Consumer[Any](getClass.getName) { |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
198 |
case _: Session.Raw_Edits => |
56770
e160ae47db94
mane delayed events outside of Swing thread -- triggers no longer require Swing_Thread.later;
wenzelm
parents:
56715
diff
changeset
|
199 |
overview.delay_repaint.postpone(PIDE.options.seconds("editor_input_delay")) |
49196
1d63ceb0d177
postpone update of text overview panel after incoming session edits, to improve reactivity of editing massive theories like src/HOL/Multivariate_Analysis;
wenzelm
parents:
49195
diff
changeset
|
200 |
|
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
201 |
case changed: Session.Commands_Changed => |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
202 |
val buffer = model.buffer |
57612
990ffb84489b
clarified module name: facilitate alternative GUI frameworks;
wenzelm
parents:
56883
diff
changeset
|
203 |
GUI_Thread.later { |
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
204 |
JEdit_Lib.buffer_lock(buffer) { |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
205 |
if (model.buffer == text_area.getBuffer) { |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
206 |
val snapshot = model.snapshot() |
39740 | 207 |
|
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
208 |
val load_changed = |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
209 |
snapshot.load_commands.exists(changed.commands.contains) |
55432
9c53198dbb1c
maintain multiple command chunks and markup trees: for main chunk and loaded files;
wenzelm
parents:
54530
diff
changeset
|
210 |
|
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
211 |
if (changed.assignment || load_changed || |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
212 |
(changed.nodes.contains(model.node_name) && |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
213 |
changed.commands.exists(snapshot.node.commands.contains))) |
56770
e160ae47db94
mane delayed events outside of Swing thread -- triggers no longer require Swing_Thread.later;
wenzelm
parents:
56715
diff
changeset
|
214 |
overview.delay_repaint.invoke() |
39740 | 215 |
|
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
216 |
val visible_lines = text_area.getVisibleLines |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
217 |
if (visible_lines > 0) { |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
218 |
if (changed.assignment || load_changed) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
219 |
text_area.invalidateScreenLineRange(0, visible_lines) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
220 |
else { |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
221 |
val visible_range = JEdit_Lib.visible_range(text_area).get |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
222 |
val visible_iterator = |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
223 |
snapshot.node.command_iterator(snapshot.revert(visible_range)).map(_._1) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
224 |
if (visible_iterator.exists(changed.commands)) { |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
225 |
for { |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
226 |
line <- (0 until visible_lines).iterator |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
227 |
start = text_area.getScreenLineStartOffset(line) if start >= 0 |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
228 |
end = text_area.getScreenLineEndOffset(line) if end >= 0 |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
229 |
range = Text.Range(start, end) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
230 |
line_cmds = snapshot.node.command_iterator(snapshot.revert(range)).map(_._1) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
231 |
if line_cmds.exists(changed.commands) |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
232 |
} text_area.invalidateScreenLineRange(line, line) |
50770
82d48783fd7a
more direct invalidateScreenLineRange after changed assignment;
wenzelm
parents:
50363
diff
changeset
|
233 |
} |
46583 | 234 |
} |
46918
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
235 |
} |
39740 | 236 |
} |
237 |
} |
|
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
238 |
} |
39740 | 239 |
} |
240 |
||
241 |
||
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
242 |
/* activation */ |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
243 |
|
34808
e462572536e9
eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents:
34806
diff
changeset
|
244 |
private def activate() |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
245 |
{ |
42825 | 246 |
val painter = text_area.getPainter |
49410
34acbcc33adf
tuned signature -- more general Text_Area_Painter operations;
wenzelm
parents:
49408
diff
changeset
|
247 |
|
54461 | 248 |
painter.addExtension(TextAreaPainter.LOWEST_LAYER, update_view) |
49411 | 249 |
rich_text_area.activate() |
42825 | 250 |
text_area.getGutter.addExtension(gutter_painter) |
52479
bb516d01d259
more aggresive ESCAPE handling, while retaining its regular meaning for jEdit;
wenzelm
parents:
50915
diff
changeset
|
251 |
text_area.addKeyListener(key_listener) |
34810 | 252 |
text_area.addCaretListener(caret_listener) |
253 |
text_area.addLeftOfScrollBar(overview) |
|
58748 | 254 |
Isabelle.structure_matchers(JEdit_Lib.buffer_mode(text_area.getBuffer)). |
255 |
foreach(text_area.addStructureMatcher(_)) |
|
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
256 |
session.raw_edits += main |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
257 |
session.commands_changed += main |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
258 |
} |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
259 |
|
34808
e462572536e9
eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents:
34806
diff
changeset
|
260 |
private def deactivate() |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
261 |
{ |
42825 | 262 |
val painter = text_area.getPainter |
49410
34acbcc33adf
tuned signature -- more general Text_Area_Painter operations;
wenzelm
parents:
49408
diff
changeset
|
263 |
|
56715
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
264 |
session.raw_edits -= main |
52125652e82a
clarified Session.Consumer, with Session.Outlet managed by dispatcher thread;
wenzelm
parents:
56662
diff
changeset
|
265 |
session.commands_changed -= main |
58748 | 266 |
Isabelle.structure_matchers(JEdit_Lib.buffer_mode(text_area.getBuffer)). |
267 |
foreach(text_area.removeStructureMatcher(_)) |
|
52479
bb516d01d259
more aggresive ESCAPE handling, while retaining its regular meaning for jEdit;
wenzelm
parents:
50915
diff
changeset
|
268 |
text_area.removeLeftOfScrollBar(overview); overview.delay_repaint.revoke() |
49195 | 269 |
text_area.removeCaretListener(caret_listener); delay_caret_update.revoke() |
52479
bb516d01d259
more aggresive ESCAPE handling, while retaining its regular meaning for jEdit;
wenzelm
parents:
50915
diff
changeset
|
270 |
text_area.removeKeyListener(key_listener) |
42825 | 271 |
text_area.getGutter.removeExtension(gutter_painter) |
49411 | 272 |
rich_text_area.deactivate() |
54461 | 273 |
painter.removeExtension(update_view) |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
274 |
} |
42825 | 275 |
} |