author | wenzelm |
Sun, 25 Nov 2012 20:59:32 +0100 | |
changeset 50205 | 788c8263e634 |
parent 50199 | 6d04e2422769 |
child 50207 | 54be125d8cdc |
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 |
||
44379 | 13 |
import scala.collection.mutable |
45460 | 14 |
import scala.collection.immutable.SortedMap |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
15 |
import scala.actors.Actor._ |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
16 |
|
43520
cec9b95fa35d
explicit import java.lang.System to prevent odd scope problems;
wenzelm
parents:
43510
diff
changeset
|
17 |
import java.lang.System |
45744
0ad063afa3d6
caret_range based on BreakIterator, which handles combined unicode characters as well;
wenzelm
parents:
45665
diff
changeset
|
18 |
import java.text.BreakIterator |
46572 | 19 |
import java.awt.{Color, Graphics2D, Point} |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
20 |
import javax.swing.event.{CaretListener, CaretEvent} |
34734 | 21 |
|
49410
34acbcc33adf
tuned signature -- more general Text_Area_Painter operations;
wenzelm
parents:
49408
diff
changeset
|
22 |
import org.gjt.sp.jedit.{jEdit, Debug} |
34709 | 23 |
import org.gjt.sp.jedit.gui.RolloverButton |
39176
b8fdd3ae8815
Document_View: more precise painting of gutter icons, only if line selection area is sufficiently large;
wenzelm
parents:
39175
diff
changeset
|
24 |
import org.gjt.sp.jedit.options.GutterOptionPane |
47392 | 25 |
import org.gjt.sp.jedit.textarea.{JEditTextArea, TextArea, TextAreaExtension, TextAreaPainter} |
43369
4c86b3405010
separate isabelle.jedit.Text_Painter, which actually replaces the original TextAreaPainter$PaintText instance;
wenzelm
parents:
43282
diff
changeset
|
26 |
import org.gjt.sp.jedit.syntax.{SyntaxStyle} |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
27 |
|
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
28 |
|
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
29 |
object Document_View |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
30 |
{ |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
31 |
/* 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
|
32 |
|
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
33 |
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
|
34 |
|
39741
62b91eb2d39a
CONTROL-mouse management: handle windowIconified;
wenzelm
parents:
39740
diff
changeset
|
35 |
def apply(text_area: JEditTextArea): 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
|
36 |
{ |
38223 | 37 |
Swing_Thread.require() |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
38 |
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
|
39 |
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
|
40 |
case _ => None |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
41 |
} |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
42 |
} |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
43 |
|
39741
62b91eb2d39a
CONTROL-mouse management: handle windowIconified;
wenzelm
parents:
39740
diff
changeset
|
44 |
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
|
45 |
{ |
38223 | 46 |
Swing_Thread.require() |
34788
3779c54a2d21
direct apply for Document_Model and Document_View;
wenzelm
parents:
34784
diff
changeset
|
47 |
apply(text_area) match { |
39636 | 48 |
case None => |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
49 |
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
|
50 |
doc_view.deactivate() |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
51 |
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
|
52 |
} |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
53 |
} |
43397 | 54 |
|
55 |
def init(model: Document_Model, text_area: JEditTextArea): Document_View = |
|
56 |
{ |
|
57 |
exit(text_area) |
|
58 |
val doc_view = new Document_View(model, text_area) |
|
59 |
text_area.putClientProperty(key, doc_view) |
|
60 |
doc_view.activate() |
|
61 |
doc_view |
|
62 |
} |
|
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
63 |
} |
34403
6c812a3cb170
information on command-phase left of scrollbar (with panel)
immler@in.tum.de
parents:
diff
changeset
|
64 |
|
34733 | 65 |
|
43376
0f6880c1c759
some direct text foreground painting, instead of token marking;
wenzelm
parents:
43369
diff
changeset
|
66 |
class Document_View(val model: Document_Model, val text_area: JEditTextArea) |
34654 | 67 |
{ |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
68 |
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
|
69 |
|
50205 | 70 |
def get_rendering(): Rendering = Rendering(model.snapshot(), PIDE.options.value) |
49411 | 71 |
|
49492 | 72 |
val rich_text_area = new Rich_Text_Area(text_area.getView, text_area, get_rendering _, false) |
49411 | 73 |
|
34403
6c812a3cb170
information on command-phase left of scrollbar (with panel)
immler@in.tum.de
parents:
diff
changeset
|
74 |
|
44379 | 75 |
/* perspective */ |
76 |
||
77 |
def perspective(): Text.Perspective = |
|
78 |
{ |
|
79 |
Swing_Thread.require() |
|
44776
47e8c8daccae
added "check" button: adhoc change to full buffer perspective;
wenzelm
parents:
44615
diff
changeset
|
80 |
val buffer_range = model.buffer_range() |
44473 | 81 |
Text.Perspective( |
44379 | 82 |
for { |
83 |
i <- 0 until text_area.getVisibleLines |
|
46997 | 84 |
start = text_area.getScreenLineStartOffset(i) |
85 |
stop = text_area.getScreenLineEndOffset(i) |
|
44379 | 86 |
if start >= 0 && stop >= 0 |
46997 | 87 |
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
|
88 |
if !range.is_singularity |
44379 | 89 |
} |
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
|
90 |
yield range) |
44379 | 91 |
} |
92 |
||
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
|
93 |
private def update_perspective = new TextAreaExtension |
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
|
94 |
{ |
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
|
95 |
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
|
96 |
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
|
97 |
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
|
98 |
{ |
49424 | 99 |
// no robust_body |
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
|
100 |
model.update_perspective() |
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
|
101 |
} |
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
|
102 |
} |
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
|
103 |
|
44379 | 104 |
|
49411 | 105 |
/* gutter */ |
34513 | 106 |
|
42825 | 107 |
private val gutter_painter = new TextAreaExtension |
39175 | 108 |
{ |
109 |
override def paintScreenLineRange(gfx: Graphics2D, |
|
110 |
first_line: Int, last_line: Int, physical_lines: Array[Int], |
|
111 |
start: Array[Int], end: Array[Int], y: Int, line_height: Int) |
|
112 |
{ |
|
49411 | 113 |
rich_text_area.robust_body(()) { |
46920
5f44c8bea84e
more explicit indication of swing thread context;
wenzelm
parents:
46918
diff
changeset
|
114 |
Swing_Thread.assert() |
5f44c8bea84e
more explicit indication of swing thread context;
wenzelm
parents:
46918
diff
changeset
|
115 |
|
43404 | 116 |
val gutter = text_area.getGutter |
117 |
val width = GutterOptionPane.getSelectionAreaWidth |
|
118 |
val border_width = jEdit.getIntegerProperty("view.gutter.borderWidth", 3) |
|
119 |
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
|
120 |
|
43404 | 121 |
if (gutter.isSelectionAreaEnabled && !gutter.isExpanded && width >= 12 && line_height >= 12) { |
49408 | 122 |
val buffer = model.buffer |
123 |
JEdit_Lib.buffer_lock(buffer) { |
|
49410
34acbcc33adf
tuned signature -- more general Text_Area_Painter operations;
wenzelm
parents:
49408
diff
changeset
|
124 |
val rendering = get_rendering() |
49356 | 125 |
|
43404 | 126 |
for (i <- 0 until physical_lines.length) { |
127 |
if (physical_lines(i) != -1) { |
|
49843
afddf4e26fac
further refinement of jEdit line range, avoiding lack of final \n;
wenzelm
parents:
49492
diff
changeset
|
128 |
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
|
129 |
|
43404 | 130 |
// gutter icons |
49356 | 131 |
rendering.gutter_message(line_range) match { |
46178
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
45744
diff
changeset
|
132 |
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
|
133 |
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
|
134 |
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
|
135 |
icon.paintIcon(gutter, gfx, x0, y0) |
46178
1c5c88f6feb5
clarified Isabelle_Rendering vs. physical painting;
wenzelm
parents:
45744
diff
changeset
|
136 |
case None => |
43404 | 137 |
} |
39175 | 138 |
} |
139 |
} |
|
140 |
} |
|
141 |
} |
|
142 |
} |
|
143 |
} |
|
144 |
} |
|
145 |
||
146 |
||
37129 | 147 |
/* caret handling */ |
34810 | 148 |
|
46740
852baa599351
explicitly revoke delay, to avoid spurious timer events after deactivation of related components;
wenzelm
parents:
46583
diff
changeset
|
149 |
private val delay_caret_update = |
50205 | 150 |
Swing_Thread.delay_last(Time.seconds(PIDE.options.real("editor_input_delay"))) { |
44805 | 151 |
session.caret_focus.event(Session.Caret_Focus) |
34810 | 152 |
} |
46740
852baa599351
explicitly revoke delay, to avoid spurious timer events after deactivation of related components;
wenzelm
parents:
46583
diff
changeset
|
153 |
|
852baa599351
explicitly revoke delay, to avoid spurious timer events after deactivation of related components;
wenzelm
parents:
46583
diff
changeset
|
154 |
private val caret_listener = new CaretListener { |
49195 | 155 |
override def caretUpdate(e: CaretEvent) { delay_caret_update.invoke() } |
34810 | 156 |
} |
157 |
||
158 |
||
46572 | 159 |
/* 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
|
160 |
|
47993 | 161 |
private object overview extends Text_Overview(this) |
46572 | 162 |
{ |
46571
edcccd7a9eee
overview.delay_repaint: avoid wasting GUI cycles via update_delay;
wenzelm
parents:
46550
diff
changeset
|
163 |
val delay_repaint = |
50205 | 164 |
Swing_Thread.delay_first(Time.seconds(PIDE.options.real("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
|
165 |
} |
34403
6c812a3cb170
information on command-phase left of scrollbar (with panel)
immler@in.tum.de
parents:
diff
changeset
|
166 |
|
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
167 |
|
39740 | 168 |
/* main actor */ |
169 |
||
170 |
private val main_actor = actor { |
|
171 |
loop { |
|
172 |
react { |
|
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
|
173 |
case _: Session.Raw_Edits => |
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
|
174 |
Swing_Thread.later { |
50205 | 175 |
overview.delay_repaint.postpone(Time.seconds(PIDE.options.real("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
|
176 |
} |
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
|
177 |
|
44608 | 178 |
case changed: Session.Commands_Changed => |
39740 | 179 |
val buffer = model.buffer |
46918
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
180 |
Swing_Thread.later { |
49406 | 181 |
JEdit_Lib.buffer_lock(buffer) { |
46918
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
182 |
if (model.buffer == text_area.getBuffer) { |
47027
fc3bb6c02a3c
explicit propagation of assignment event, even if changed command set is empty;
wenzelm
parents:
47013
diff
changeset
|
183 |
val snapshot = model.snapshot() |
39740 | 184 |
|
47027
fc3bb6c02a3c
explicit propagation of assignment event, even if changed command set is empty;
wenzelm
parents:
47013
diff
changeset
|
185 |
if (changed.assignment || |
46918
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
186 |
(changed.nodes.contains(model.name) && |
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
187 |
changed.commands.exists(snapshot.node.commands.contains))) |
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
|
188 |
Swing_Thread.later { overview.delay_repaint.invoke() } |
39740 | 189 |
|
49408 | 190 |
JEdit_Lib.visible_range(text_area) match { |
46918
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
191 |
case Some(visible) => |
49408 | 192 |
if (changed.assignment) JEdit_Lib.invalidate_range(text_area, visible) |
46918
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
193 |
else { |
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
194 |
val visible_cmds = |
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
195 |
snapshot.node.command_range(snapshot.revert(visible)).map(_._1) |
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
196 |
if (visible_cmds.exists(changed.commands)) { |
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
197 |
for { |
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
198 |
line <- 0 until text_area.getVisibleLines |
46997 | 199 |
start = text_area.getScreenLineStartOffset(line) if start >= 0 |
200 |
end = text_area.getScreenLineEndOffset(line) if end >= 0 |
|
49843
afddf4e26fac
further refinement of jEdit line range, avoiding lack of final \n;
wenzelm
parents:
49492
diff
changeset
|
201 |
range = Text.Range(start, end) |
46997 | 202 |
line_cmds = snapshot.node.command_range(snapshot.revert(range)).map(_._1) |
46918
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
203 |
if line_cmds.exists(changed.commands) |
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
204 |
} text_area.invalidateScreenLineRange(line, line) |
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
205 |
} |
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
206 |
} |
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
207 |
case None => |
46583 | 208 |
} |
46918
1752164d916b
prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents:
46815
diff
changeset
|
209 |
} |
39740 | 210 |
} |
211 |
} |
|
212 |
||
213 |
case bad => System.err.println("command_change_actor: ignoring bad message " + bad) |
|
214 |
} |
|
215 |
} |
|
216 |
} |
|
217 |
||
218 |
||
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
219 |
/* activation */ |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
220 |
|
34808
e462572536e9
eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents:
34806
diff
changeset
|
221 |
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
|
222 |
{ |
42825 | 223 |
val painter = text_area.getPainter |
49410
34acbcc33adf
tuned signature -- more general Text_Area_Painter operations;
wenzelm
parents:
49408
diff
changeset
|
224 |
|
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
|
225 |
painter.addExtension(TextAreaPainter.LOWEST_LAYER, update_perspective) |
49411 | 226 |
rich_text_area.activate() |
42825 | 227 |
text_area.getGutter.addExtension(gutter_painter) |
34810 | 228 |
text_area.addCaretListener(caret_listener) |
229 |
text_area.addLeftOfScrollBar(overview) |
|
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
|
230 |
session.raw_edits += main_actor |
39740 | 231 |
session.commands_changed += main_actor |
34784
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
232 |
} |
02959dcea756
split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents:
34777
diff
changeset
|
233 |
|
34808
e462572536e9
eliminated global Session.document_0 -- did not work due to hardwired id;
wenzelm
parents:
34806
diff
changeset
|
234 |
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
|
235 |
{ |
42825 | 236 |
val painter = text_area.getPainter |
49410
34acbcc33adf
tuned signature -- more general Text_Area_Painter operations;
wenzelm
parents:
49408
diff
changeset
|
237 |
|
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
|
238 |
session.raw_edits -= main_actor |
39740 | 239 |
session.commands_changed -= main_actor |
49195 | 240 |
text_area.removeCaretListener(caret_listener); delay_caret_update.revoke() |
241 |
text_area.removeLeftOfScrollBar(overview); overview.delay_repaint.revoke() |
|
42825 | 242 |
text_area.getGutter.removeExtension(gutter_painter) |
49411 | 243 |
rich_text_area.deactivate() |
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
|
244 |
painter.removeExtension(update_perspective) |
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 |
} |