ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 UTC

1package CFClient::UI; 1package DC::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util ();
6use List::Util (); 6use List::Util ();
7 7
8use CFClient; 8use DC;
9use DC::Pod;
10use DC::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 18
16sub check_tooltip { 19our %WIDGET; # all widgets, weak-referenced
20
21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
17 if (!$GRAB) { 24 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
29 $TOOLTIP->hide;
30
22 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
23 33
24 my $tip = $widget->{tooltip}; 34 return if $ENV{CFPLUS_DEBUG} & 8;
25 35
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip}); 36 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 37 $TOOLTIP->show;
31 } 38 }
32 39
33 return; 40 return;
34 } 41 }
35 } 42 }
36 } 43 }
37 44
38 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
39 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48};
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
40} 71}
41 72
42# class methods for events 73# class methods for events
43sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 76 if $FOCUS;
46} 77}
47 78
48sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 81 if $FOCUS;
82}
83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->again;
94 }
51} 95}
52 96
53sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
54 my ($ev) = @_; 98 my ($ev) = @_;
55 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
56 100
57 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
58 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
59 105
60 $GRAB = $widget; 106 $GRAB = $widget;
61 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
62 108
63 check_tooltip; 109 $TOOLTIP_WATCHER->invoke;
64 } 110 }
65
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 111
68 if ($GRAB) { 112 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y); 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); 114 # mousewheel
115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
121 $GRAB->emit (mouse_wheel => $ev);
122 } else {
123 $GRAB->emit (button_down => $ev)
124 }
71 } 125 }
72} 126}
73 127
74sub feed_sdl_button_up_event { 128sub feed_sdl_button_up_event {
75 my ($ev) = @_; 129 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y});
77 130
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 131 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
79 132
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 133 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 134
82 if ($GRAB) { 135 $GRAB->emit (button_up => $ev)
83 ($x, $y) = $GRAB->coord2local ($x, $y); 136 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 137
87 if (!$BUTTON_STATE) { 138 unless ($BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 140 $grab->update if $grab;
90 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
91 142
92 check_tooltip; 143 check_hover $widget;
144 $TOOLTIP_WATCHER->invoke;
93 } 145 }
94} 146}
95 147
96sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
97 my ($ev) = @_; 149 my ($ev) = @_;
98 my ($x, $y) = ($ev->{x}, $ev->{y}); 150 my ($x, $y) = ($ev->{x}, $ev->{y});
99 151
100 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 152 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
101 153
102 if ($widget != $HOVER) { 154 check_hover $widget;
103 my $hover = $HOVER; $HOVER = $widget;
104 155
105 $hover->update if $hover && $hover->{can_hover}; 156 $HOVER->emit (mouse_motion => $ev)
106 $HOVER->update if $HOVER && $HOVER->{can_hover};
107
108 check_tooltip;
109 }
110
111 if ($HOVER) { 157 if $HOVER;
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
115} 158}
116 159
117# convert position array to integers 160# convert position array to integers
118sub harmonize { 161sub harmonize {
119 my ($vals) = @_; 162 my ($vals) = @_;
… …
125 $rem += $_ - $i; 168 $rem += $_ - $i;
126 $_ = $i; 169 $_ = $i;
127 } 170 }
128} 171}
129 172
173sub full_refresh {
174 # make a copy, otherwise for complains about freed values.
175 my @widgets = values %WIDGET;
176
177 $_->update
178 for @widgets;
179}
180
181sub reconfigure_widgets {
182 # make a copy, otherwise C<for> complains about freed values.
183 my @widgets = values %WIDGET;
184
185 $_->reconfigure
186 for @widgets;
187}
188
189# call when resolution changes etc.
190sub rescale_widgets {
191 my ($sx, $sy) = @_;
192
193 for my $widget (values %WIDGET) {
194 if ($widget->{is_toplevel}) {
195 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
196 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
197
198 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
200 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
201 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
202 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
203 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
204
205 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
206 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
207
208 }
209 }
210
211 reconfigure_widgets;
212}
213
130############################################################################# 214#############################################################################
131 215
216package DC::UI::Event;
217
218sub xy {
219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
220}
221
222#############################################################################
223
132package CFClient::UI::Base; 224package DC::UI::Base;
133 225
134use strict; 226use strict;
135 227
136use CFClient::OpenGL; 228use DC::OpenGL;
137 229
138sub new { 230sub new {
139 my $class = shift; 231 my $class = shift;
140 232
141 my $self = bless { 233 my $self = bless {
142 x => 0, 234 x => "center",
143 y => 0, 235 y => "center",
144 z => 0, 236 z => 0,
237 w => undef,
238 h => undef,
145 can_events => 1, 239 can_events => 1,
146 @_ 240 @_
147 }, $class; 241 }, $class;
148 242
243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
244
149 for (keys %$self) { 245 for (keys %$self) {
150 if (/^connect_(.*)$/) { 246 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
152 } 248 }
153 } 249 }
154 250
251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
252 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
253 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
254 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
255 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
256
257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
259
260 $self->show if $layout->{show};
261 }
262
155 $self 263 $self
156} 264}
157 265
158sub destroy { 266sub destroy {
159 my ($self) = @_; 267 my ($self) = @_;
160 268
161 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
162 %$self = (); 271 %$self = ();
163} 272}
164 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
165sub show { 278sub show {
166 my ($self) = @_; 279 my ($self) = @_;
167 280
168 return if $self->{parent}; 281 return if $self->{parent};
169 282
170 $CFClient::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
171} 284}
172 285
173sub hide { 286sub set_visible {
174 my ($self) = @_; 287 my ($self) = @_;
288
289 return if $self->{visible};
290
291 $self->{root} = $self->{parent}{root};
292 $self->{visible} = $self->{parent}{visible} + 1;
293
294 $self->emit (visibility_change => 1);
295
296 $self->realloc if !exists $self->{req_w};
297
298 $_->set_visible for $self->children;
299}
300
301sub set_invisible {
302 my ($self) = @_;
303
304 return unless $self->{visible};
305
306 $_->set_invisible for $self->children;
307
308 delete $self->{visible};
309 delete $self->{root};
175 310
176 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
178 313
314 $DC::UI::TOOLTIP_WATCHER->invoke
315 if $TOOLTIP->{owner} == $self;
316
317 $self->emit ("focus_out");
318 $self->emit (visibility_change => 0);
319}
320
321sub set_visibility {
322 my ($self, $visible) = @_;
323
324 return if $self->{visible} == $visible;
325
326 $visible ? $self->show
327 : $self->hide;
328}
329
330sub toggle_visibility {
331 my ($self) = @_;
332
333 $self->{visible}
334 ? $self->hide
335 : $self->show;
336}
337
338sub hide {
339 my ($self) = @_;
340
341 $self->set_invisible;
342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
179 $self->{parent}->remove ($self) 346 $parent->remove ($self);
180 if $self->{parent}; 347 }
181} 348}
182 349
183sub move { 350sub move_abs {
184 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
185 352
186 $self->{x} = int $x; 353 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
187 $self->{y} = int $y; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
188 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
189 356
190 $self->update; 357 $self->update;
191} 358}
192 359
193sub set_size { 360sub set_size {
194 my ($self, $w, $h) = @_; 361 my ($self, $w, $h) = @_;
195 362
196 $self->{user_w} = $w; 363 $self->{force_w} = $w;
197 $self->{user_h} = $h; 364 $self->{force_h} = $h;
198 365
199 $self->check_size; 366 $self->realloc;
367}
368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 my ($w, $h) = @$self{qw(max_w max_h)};
374
375 if ($w <= 0 || $h <= 0) {
376 my ($mw, $mh) = $self->{parent}
377 ? $self->{parent}->get_max_wh
378 : ($::WIDTH, $::HEIGHT);
379
380 $w = $mw if $w <= 0;
381 $h = $mh if $h <= 0;
382 }
383
384 ($w, $h)
200} 385}
201 386
202sub size_request { 387sub size_request {
203 require Carp; 388 require Carp;
204 Carp::confess "size_request is abstract"; 389 Carp::confess "size_request is abstract";
205} 390}
206 391
392sub baseline_shift {
393 0
394}
395
207sub configure { 396sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 397 my ($self, $x, $y, $w, $h) = @_;
209 398
210 if ($self->{aspect}) { 399 if ($self->{aspect}) {
400 my ($ow, $oh) = ($w, $h);
401
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 402 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 403 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
213 404
214 # use alignment to adjust x, y 405 # use alignment to adjust x, y
215 406
216 $x += int +($w - $w2) * 0.5; 407 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 408 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 409 }
221 410
222 if ($self->{x} != $x || $self->{y} != $y) { 411 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 412 $self->{x} = $x;
224 $self->{y} = $y; 413 $self->{y} = $y;
225 $self->update; 414 $self->update;
226 } 415 }
227 416
228 if ($self->{w} != $w || $self->{h} != $h) { 417 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
418 return unless $self->{visible};
419
229 $self->{w} = $w; 420 $self->{alloc_w} = $w;
230 $self->{h} = $h; 421 $self->{alloc_h} = $h;
231 422
232 $self->size_allocate ($w, $h); 423 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 424 }
235}
236
237sub size_allocate {
238 # nothing to be done
239} 425}
240 426
241sub children { 427sub children {
428 # nop
242} 429}
243 430
244# call when resoltuion changes etc. 431sub visible_children {
245sub reconfigure { 432 $_[0]->children
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252} 433}
253 434
254sub set_max_size { 435sub set_max_size {
255 my ($self, $w, $h) = @_; 436 my ($self, $w, $h) = @_;
256 437
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 438 $self->{max_w} = int $w if defined $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 439 $self->{max_h} = int $h if defined $h;
259}
260 440
261# return top left coordinates 441 $self->realloc;
262sub _topleft { 442}
443
444sub set_tooltip {
263 my ($self, $x, $y) = @_; 445 my ($self, $tooltip) = @_;
264 446
265 $self->{parent} 447 $tooltip =~ s/^\s+//;
266 or Carp::confess "no parent widget in _topleft\n";#d# 448 $tooltip =~ s/\s+$//;
267 449
268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 450 return if $self->{tooltip} eq $tooltip;
451
452 $self->{tooltip} = $tooltip;
453
454 if ($DC::UI::TOOLTIP->{owner} == $self) {
455 delete $DC::UI::TOOLTIP->{owner};
456 $DC::UI::TOOLTIP_WATCHER->invoke;
457 }
269} 458}
270 459
271# translate global coordinates to local coordinate system 460# translate global coordinates to local coordinate system
272sub coord2local { 461sub coord2local {
273 my ($self, $x, $y) = @_; 462 my ($self, $x, $y) = @_;
274 463
275 my ($X, $Y) = $self->_topleft; 464 return (undef, undef) unless $self->{parent};
276 ($x - $X, $y - $Y) 465
466 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
277} 467}
278 468
279# translate local coordinates to global coordinate system 469# translate local coordinates to global coordinate system
280sub coord2global { 470sub coord2global {
281 my ($self, $x, $y) = @_; 471 my ($self, $x, $y) = @_;
282 472
283 my ($X, $Y) = $self->_topleft; 473 return (undef, undef) unless $self->{parent};
284 ($x + $X, $y + $Y)
285}
286 474
475 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
476}
477
287sub focus_in { 478sub invoke_focus_in {
288 my ($self) = @_; 479 my ($self) = @_;
289 480
290 return if $FOCUS == $self; 481 return if $FOCUS == $self;
291 return unless $self->{can_focus}; 482 return unless $self->{can_focus};
292 483
293 my $focus = $FOCUS; $FOCUS = $self; 484 $FOCUS = $self;
294 485
295 $self->emit (focus_in => $focus); 486 $self->update;
296 487
297 $focus->update if $focus; 488 0
298 $FOCUS->update;
299} 489}
300 490
301sub focus_out { 491sub invoke_focus_out {
302 my ($self) = @_; 492 my ($self) = @_;
303 493
304 return unless $FOCUS == $self; 494 return unless $FOCUS == $self;
305 495
306 my $focus = $FOCUS; undef $FOCUS; 496 undef $FOCUS;
307 497
308 $self->emit (focus_out => $focus); 498 $self->update;
309 499
310 $focus->update if $focus; #? 500 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
311} 501 unless $FOCUS;
312 502
503 0
504}
505
506sub grab_focus {
507 my ($self) = @_;
508
509 $FOCUS->emit ("focus_out") if $FOCUS;
510 $self->emit ("focus_in");
511}
512
313sub mouse_motion { } 513sub invoke_mouse_motion { 0 }
314sub button_up { } 514sub invoke_button_up { 0 }
315sub key_down { } 515sub invoke_key_down { 0 }
316sub key_up { } 516sub invoke_key_up { 0 }
517sub invoke_mouse_wheel { 0 }
317 518
318sub button_down { 519sub invoke_button_down {
319 my ($self, $ev, $x, $y) = @_; 520 my ($self, $ev, $x, $y) = @_;
320 521
321 $self->focus_in; 522 $self->grab_focus;
322}
323 523
324sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 524 0
325sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 525}
326sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
327sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
328sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
329 526
330sub draw { 527sub connect {
528 my ($self, $signal, $cb) = @_;
529
530 push @{ $self->{signal_cb}{$signal} }, $cb;
531
532 defined wantarray and DC::guard {
533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
534 @{ $self->{signal_cb}{$signal} };
535 }
536}
537
538sub disconnect_all {
331 my ($self) = @_; 539 my ($self, $signal) = @_;
332 540
333 return unless $self->{h} && $self->{w}; 541 delete $self->{signal_cb}{$signal};
334
335 glPushMatrix;
336 glTranslate $self->{x}, $self->{y}, 0;
337 $self->_draw;
338 glPopMatrix;
339
340 if ($self == $HOVER && $self->{can_hover}) {
341 my ($x, $y) = @$self{qw(x y)};
342
343 glColor 1, 0.8, 0.5, 0.2;
344 glEnable GL_BLEND;
345 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
346 glBegin GL_QUADS;
347 glVertex $x , $y;
348 glVertex $x + $self->{w}, $y;
349 glVertex $x + $self->{w}, $y + $self->{h};
350 glVertex $x , $y + $self->{h};
351 glEnd;
352 glDisable GL_BLEND;
353 }
354
355 if ($ENV{PCLIENT_DEBUG}) {
356 glPushMatrix;
357 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0;
361 glVertex $self->{w}, 0;
362 glVertex $self->{w}, $self->{h};
363 glVertex 0 , $self->{h};
364 glEnd;
365 glPopMatrix;
366 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
367 }
368} 542}
369 543
370sub _draw { 544my %has_coords = (
371 my ($self) = @_; 545 button_down => 1,
546 button_up => 1,
547 mouse_motion => 1,
548 mouse_wheel => 1,
549);
372 550
373 warn "no draw defined for $self\n"; 551sub emit {
374} 552 my ($self, $signal, @args) = @_;
375 553
554 # I do not really like this solution, but I do not like duplication
555 # and needlessly verbose code, either.
556 my @append
557 = $has_coords{$signal}
558 ? $args[0]->xy ($self)
559 : ();
560
561 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
562
563 for my $cb (
564 @{$self->{signal_cb}{$signal} || []}, # before
565 ($self->can ("invoke_$signal") || sub { 1 }), # closure
566 ) {
567 return $cb->($self, @args, @append) || next;
568 }
569
570 # parent
571 $self->{parent} && $self->{parent}->emit ($signal, @args)
572}
573
376sub find_widget { 574#sub find_widget {
377 my ($self, $x, $y) = @_; 575# in .xs
378
379 return () unless $self->{can_events};
380
381 return $self
382 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
383 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
384
385 ()
386}
387 576
388sub set_parent { 577sub set_parent {
389 my ($self, $parent) = @_; 578 my ($self, $parent) = @_;
390 579
391 Scalar::Util::weaken ($self->{parent} = $parent); 580 DC::weaken ($self->{parent} = $parent);
581 $self->set_visible if $parent->{visible};
392} 582}
393 583
394sub check_size { 584sub realloc {
395 my ($self) = @_; 585 my ($self) = @_;
396 586
397 $self->{parent} 587 if ($self->{visible}) {
398 or return 1; 588 return if $self->{root}{realloc}{$self+0};
399 589
400 my ($w, $h) = $self->{user_w} && $self->{user_h} 590 $self->{root}{realloc}{$self+0} = $self;
401 ? @$self{qw(user_w user_h)} 591 $self->{root}->update;
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else { 592 } else {
416 0 593 delete $self->{req_w};
594 delete $self->{req_h};
417 } 595 }
418} 596}
419 597
420sub update { 598sub update {
421 my ($self) = @_; 599 my ($self) = @_;
422 600
423 $self->{parent}->update 601 $self->{parent}->update
424 if $self->{parent}; 602 if $self->{parent};
425} 603}
426 604
427sub connect { 605sub reconfigure {
428 my ($self, $signal, $cb) = @_; 606 my ($self) = @_;
429 607
430 push @{ $self->{signal_cb}{$signal} }, $cb; 608 $self->realloc;
609 $self->update;
431} 610}
432 611
433sub emit { 612# using global variables seems a bit hacky, but passing through all drawing
434 my ($self, $signal, @args) = @_; 613# functions seems pointless.
614our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
435 615
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 616#sub draw {
617#CFPlus.xs
618
619sub _draw {
620 my ($self) = @_;
621
622 warn "no draw defined for $self\n";
437} 623}
438 624
439sub DESTROY { 625sub DESTROY {
440 my ($self) = @_; 626 my ($self) = @_;
441 627
442 #$self->deactivate; 628 return if DC::in_destruct;
629
630 local $@;
631 eval { $self->destroy };
632 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
633
634 delete $WIDGET{$self+0};
443} 635}
444 636
445############################################################################# 637#############################################################################
446 638
447package CFClient::UI::DrawBG; 639package DC::UI::DrawBG;
448 640
449our @ISA = CFClient::UI::Base::; 641our @ISA = DC::UI::Base::;
450 642
451use strict; 643use strict;
452use CFClient::OpenGL; 644use DC::OpenGL;
453 645
454sub new { 646sub new {
455 my $class = shift; 647 my $class = shift;
456 648
457 # range [value, low, high, page]
458
459 $class->SUPER::new ( 649 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
462 @_ 652 @_
463 ) 653 )
464} 654}
465 655
466sub _draw { 656sub _draw {
467 my ($self) = @_; 657 my ($self) = @_;
468 658
659 my $color = $FOCUS == $self && $self->{active_bg}
660 ? $self->{active_bg}
661 : $self->{bg};
662
663 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
470 665
471 glEnable GL_BLEND; 666 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 668 glColor_premultiply @$color;
474 669 glRect 0, 0, $w, $h;
475 glBegin GL_QUADS;
476 glVertex 0 , 0;
477 glVertex 0 , $h;
478 glVertex $w, $h;
479 glVertex $w, 0;
480 glEnd;
481
482 glDisable GL_BLEND; 670 glDisable GL_BLEND;
671 }
483} 672}
484 673
485############################################################################# 674#############################################################################
486 675
487package CFClient::UI::Empty; 676package DC::UI::Empty;
488 677
489our @ISA = CFClient::UI::Base::; 678our @ISA = DC::UI::Base::;
490 679
491sub new { 680sub new {
492 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
494} 683}
495 684
496sub size_request { 685sub size_request {
497 (0, 0) 686 my ($self) = @_;
687
688 ($self->{w} + 0, $self->{h} + 0)
498} 689}
499 690
500sub draw { } 691sub draw { }
501 692
502############################################################################# 693#############################################################################
503 694
504package CFClient::UI::Container; 695package DC::UI::Container;
505 696
506our @ISA = CFClient::UI::Base::; 697our @ISA = DC::UI::Base::;
507 698
508sub new { 699sub new {
509 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
510 701
511 my $children = delete $arg{children} || []; 702 my $children = delete $arg{children};
512 703
513 my $self = $class->SUPER::new ( 704 my $self = $class->SUPER::new (
514 children => [], 705 children => [],
515 can_events => 0, 706 can_events => 0,
516 %arg, 707 %arg,
517 ); 708 );
709
518 $self->add ($_) for @$children; 710 $self->add (@$children)
711 if $children && @$children;
519 712
520 $self 713 $self
521} 714}
522 715
716sub realloc {
717 my ($self) = @_;
718
719 $self->{force_realloc} = 1;
720 $self->{force_size_alloc} = 1;
721 $self->SUPER::realloc;
722}
723
523sub add { 724sub add {
524 my ($self, $child) = @_; 725 my ($self, @widgets) = @_;
525 726
526 $child->set_parent ($self); 727 $_->set_parent ($self)
728 for @widgets;
527 729
730 # TODO: only do this in widgets that need it, e.g. root, fixed
528 use sort 'stable'; 731 use sort 'stable';
529 732
530 $self->{children} = [ 733 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 735 @{$self->{children}}, @widgets
533 ]; 736 ];
534 737
535 $child->check_size; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
536} 743}
537 744
538sub children { 745sub children {
539 @{ $_[0]{children} } 746 @{ $_[0]{children} }
540} 747}
541 748
542sub remove { 749sub remove {
543 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
544 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
545 delete $child->{parent}; 755 delete $child->{parent};
546 $child->hide; 756 $child->hide;
547
548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
549 759
550 $self->check_size; 760 $self->realloc;
551 $self->update;
552} 761}
553 762
554sub clear { 763sub clear {
555 my ($self) = @_; 764 my ($self) = @_;
556 765
557 my $children = delete $self->{children}; 766 my $children = $self->{children};
558 $self->{children} = []; 767 $self->{children} = [];
559 768
560 for (@$children) { 769 for (@$children) {
561 delete $_->{parent}; 770 delete $_->{parent};
562 $_->hide; 771 $_->hide;
563 } 772 }
773
774 $self->realloc;
564} 775}
565 776
566sub find_widget { 777sub find_widget {
567 my ($self, $x, $y) = @_; 778 my ($self, $x, $y) = @_;
568 779
569 $x -= $self->{x}; 780 $x -= $self->{x};
570 $y -= $self->{y}; 781 $y -= $self->{y};
571 782
572 my $res; 783 my $res;
573 784
574 for (reverse @{ $self->{children} }) { 785 for (reverse $self->visible_children) {
575 $res = $_->find_widget ($x, $y) 786 $res = $_->find_widget ($x, $y)
576 and return $res; 787 and return $res;
577 } 788 }
578 789
579 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 790 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
580} 791}
581 792
582sub _draw { 793sub _draw {
583 my ($self) = @_; 794 my ($self) = @_;
584 795
585 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
586} 797}
587 798
588############################################################################# 799#############################################################################
589 800
590package CFClient::UI::Bin; 801package DC::UI::Bin;
591 802
592our @ISA = CFClient::UI::Container::; 803our @ISA = DC::UI::Container::;
593 804
594sub new { 805sub new {
595 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
596 807
597 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
598 809
599 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
600} 811}
601 812
602sub add { 813sub add {
603 my ($self, $child) = @_; 814 my ($self, $child) = @_;
604 815
605 $self->{children} = []; 816 $self->clear;
606
607 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
608} 818}
609 819
610sub remove { 820sub remove {
611 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
612 822
613 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
614 824
615 $self->{children} = [new CFClient::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
616 unless @{$self->{children}}; 826 unless @{$self->{children}};
617} 827}
618 828
619sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
620 830
621sub size_request { 831sub size_request {
622 $_[0]{children}[0]->size_request 832 $_[0]{children}[0]->size_request
623} 833}
624 834
625sub size_allocate { 835sub invoke_size_allocate {
626 my ($self, $w, $h) = @_; 836 my ($self, $w, $h) = @_;
627 837
628 $self->{children}[0]->configure (0, 0, $w, $h); 838 $self->{children}[0]->configure (0, 0, $w, $h);
839
840 1
629} 841}
630 842
631############################################################################# 843#############################################################################
844# back-buffered drawing area
632 845
633package CFClient::UI::Window; 846package DC::UI::Window;
634 847
635our @ISA = CFClient::UI::Bin::; 848our @ISA = DC::UI::Bin::;
636 849
637use CFClient::OpenGL; 850use DC::OpenGL;
638 851
639sub new { 852sub new {
640 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
641 854
642 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
643} 856}
644 857
645sub update { 858sub update {
646 my ($self) = @_; 859 my ($self) = @_;
647 860
648 # we want to do this delayed... 861 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 862 $self->SUPER::update;
651} 863}
652 864
865sub invoke_size_allocate {
866 my ($self, $w, $h) = @_;
867
868 $self->update;
869
870 $self->SUPER::invoke_size_allocate ($w, $h)
871}
872
873sub _render {
874 my ($self) = @_;
875
876 $self->{children}[0]->draw;
877}
878
653sub render_chld { 879sub render_child {
654 my ($self) = @_; 880 my ($self) = @_;
655 881
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 882 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1; 883 glClearColor 0, 0, 0, 0;
658 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw; 885
886 {
887 package DC::UI::Base;
888
889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
890 (0, 0, $self->{w}, $self->{h});
891
892 $self->_render;
893 }
660 }; 894 };
661} 895}
662 896
663sub size_allocate {
664 my ($self, $w, $h) = @_;
665
666 $self->child->configure (0, 0, $w, $h);
667
668 $self->render_chld;
669}
670
671sub _draw { 897sub _draw {
672 my ($self) = @_; 898 my ($self) = @_;
673
674 my ($w, $h) = ($self->w, $self->h);
675 899
676 my $tex = $self->{texture} 900 my $tex = $self->{texture}
677 or return; 901 or return;
678 902
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 903 glEnable GL_TEXTURE_2D;
682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 904 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
905 glColor 0, 0, 0, 1;
683 906
684 $tex->draw_quad (0, 0, $w, $h); 907 $tex->draw_quad_alpha_premultiplied (0, 0);
685 908
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
688} 910}
689 911
690############################################################################# 912#############################################################################
691 913
692package CFClient::UI::ViewPort; 914package DC::UI::ViewPort;
693 915
916use List::Util qw(min max);
917
694our @ISA = CFClient::UI::Window::; 918our @ISA = DC::UI::Window::;
695
696sub new { die }
697
698sub size_request {
699 my ($self) = @_;
700
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
703
704 @$self{qw(child_w child_h)}
705}
706
707sub _draw {
708 my ($self) = @_;
709
710 $self->{children}[1]->draw;
711}
712
713
714#############################################################################
715
716package CFClient::UI::Frame;
717
718our @ISA = CFClient::UI::Bin::;
719
720use CFClient::OpenGL;
721 919
722sub new { 920sub new {
723 my $class = shift; 921 my $class = shift;
724 922
923 $class->SUPER::new (
924 scroll_x => 0,
925 scroll_y => 1,
926 @_,
927 )
928}
929
930sub size_request {
931 my ($self) = @_;
932
933 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
934
935 $w = 1 if $self->{scroll_x};
936 $h = 1 if $self->{scroll_y};
937
938 ($w, $h)
939}
940
941sub invoke_size_allocate {
942 my ($self, $w, $h) = @_;
943
944 my $child = $self->child;
945
946 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
947 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
948
949 $self->child->configure (0, 0, $w, $h);
950 $self->update;
951
952 1
953}
954
955sub set_offset {
956 my ($self, $x, $y) = @_;
957
958 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
959 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
960
961 if ($x != $self->{view_x} or $y != $self->{view_y}) {
962 $self->{view_x} = $x;
963 $self->{view_y} = $y;
964
965 $self->emit (changed => $x, $y);
966 $self->update;
967 }
968}
969
970sub set_center {
971 my ($self, $x, $y) = @_;
972
973 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
974}
975
976sub make_visible {
977 my ($self, $x, $y, $border) = @_;
978
979 if ( $x < $self->{view_x} + $self->{w} * $border
980 || $x > $self->{view_x} + $self->{w} * (1 - $border)
981 || $y < $self->{view_y} + $self->{h} * $border
982 || $y > $self->{view_y} + $self->{h} * (1 - $border)
983 ) {
984 $self->set_center ($x, $y);
985 }
986}
987
988# hmm, this does not work for topleft of $self... but we should not ask for that
989sub coord2local {
990 my ($self, $x, $y) = @_;
991
992 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
993}
994
995sub coord2global {
996 my ($self, $x, $y) = @_;
997
998 $x = List::Util::min $self->{w}, $x - $self->{view_x};
999 $y = List::Util::min $self->{h}, $y - $self->{view_y};
1000
1001 $self->SUPER::coord2global ($x, $y)
1002}
1003
1004sub find_widget {
1005 my ($self, $x, $y) = @_;
1006
1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1009 ) {
1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1011 } else {
1012 $self->DC::UI::Base::find_widget ($x, $y)
1013 }
1014}
1015
1016sub _render {
1017 my ($self) = @_;
1018
1019 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1020 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1021
1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1023
1024 $self->SUPER::_render;
1025}
1026
1027#############################################################################
1028
1029package DC::UI::ScrolledWindow;
1030
1031our @ISA = DC::UI::Table::;
1032
1033sub new {
1034 my ($class, %arg) = @_;
1035
1036 my $child = delete $arg{child};
1037
1038 my $self;
1039
1040 my $hslider = new DC::UI::Slider
1041 c_col => 0,
1042 c_row => 1,
1043 vertical => 0,
1044 range => [0, 0, 1, 0.01], # HACK fix
1045 on_changed => sub {
1046 $self->{hpos} = $_[1];
1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048 },
1049 ;
1050
1051 my $vslider = new DC::UI::Slider
1052 c_col => 1,
1053 c_row => 0,
1054 vertical => 1,
1055 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub {
1057 $self->{vpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 },
1060 ;
1061
725 my $self = $class->SUPER::new ( 1062 $self = $class->SUPER::new (
726 bg => [1, 1, 1, 1], 1063 scroll_x => 0,
727 border_bg => [1, 1, 1, 1], 1064 scroll_y => 1,
728 border => 0.8, 1065 can_events => 1,
729 @_ 1066 hslider => $hslider,
1067 vslider => $vslider,
1068 col_expand => [1, 0],
1069 row_expand => [1, 0],
1070 %arg,
730 ); 1071 );
731 1072
1073 $self->{vp} = new DC::UI::ViewPort
1074 c_col => 0,
1075 c_row => 0,
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 on_size_allocate => sub {
1088 my ($vp, $w, $h) = @_;
1089 $vp->{parent}->update_slider;
1090 0
1091 },
1092 ;
1093
1094 $self->SUPER::add ($self->{vp});
1095
1096 $self->add ($child) if $child;
1097
732 $self 1098 $self
733} 1099}
734 1100
735sub _draw { 1101sub add {
1102 my ($self, $widget) = @_;
1103
1104 $self->{vp}->add ($self->{child} = $widget);
1105}
1106
1107sub set_offset { shift->{vp}->set_offset (@_) }
1108sub set_center { shift->{vp}->set_center (@_) }
1109sub make_visible { shift->{vp}->make_visible (@_) }
1110
1111sub update_slider {
1112 my ($self) = @_;
1113
1114 my $child = ($self->{vp} or return)->child;
1115
1116 if ($self->{scroll_x}) {
1117 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1118 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1119
1120 my $visible = $w1 > $w2;
1121 if ($visible != $self->{hslider_visible}) {
1122 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->SUPER::remove ($self->{hslider});
1125 }
1126 }
1127
1128 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{vslider})
1136 : $self->SUPER::remove ($self->{vslider});
1137 }
1138 }
1139}
1140
1141sub start_dragging {
736 my ($self) = @_; 1142 my ($self, $ev) = @_;
737 1143
738 my ($w, $h) = ($self->{w}, $self->{h}); 1144 $self->grab_focus;
739 1145
740 glEnable GL_BLEND; 1146 my $ox = $self->{vp}{view_x};
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1147 my $oy = $self->{vp}{view_y};
742 glEnable GL_TEXTURE_2D; 1148
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
744 1151
745# glBegin GL_QUADS; 1152 $ox -= $ev->{xrel};
746# glColor 0, 0, 0, 0; 1153 $oy -= $ev->{yrel};
747# glVertex 0 , 0;
748# glVertex 0 , $h;
749# glVertex $w, $h;
750# glVertex $w, 0;
751# glEnd;
752 1154
1155 $self->{vp}->set_offset ($ox, $oy);
1156 };
1157}
753 1158
754 $self->child->draw; 1159sub invoke_mouse_wheel {
755 glDisable GL_BLEND; 1160 my ($self, $ev) = @_;
756 glDisable GL_TEXTURE_2D; 1161
1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1164
1165 1
1166}
1167
1168sub invoke_button_down {
1169 my ($self, $ev, $x, $y) = @_;
1170
1171 if ($ev->{button} == 2) {
1172 $self->start_dragging ($ev);
1173 return 1;
1174 }
1175
1176 0
1177}
1178
1179sub invoke_button_up {
1180 my ($self, $ev, $x, $y) = @_;
1181
1182 if (delete $self->{motion}) {
1183 return 1;
1184 }
1185
1186 0
1187}
1188
1189sub invoke_mouse_motion {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($self->{motion}) {
1193 $self->{motion}->($ev, $x, $y);
1194 return 1;
1195 }
1196
1197 0
1198}
1199
1200sub invoke_size_allocate {
1201 my ($self, $w, $h) = @_;
1202
1203 $self->update_slider;
1204 $self->SUPER::invoke_size_allocate ($w, $h)
757} 1205}
758 1206
759############################################################################# 1207#############################################################################
760 1208
761package CFClient::UI::FancyFrame; 1209package DC::UI::Frame;
762 1210
763our @ISA = CFClient::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
764 1212
765use CFClient::OpenGL; 1213use DC::OpenGL;
766
767my @tex =
768 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
769 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
770 1214
771sub new { 1215sub new {
772 my $class = shift; 1216 my $class = shift;
773 1217
774 # TODO: user_x, user_y, overwrite moveto? 1218 $class->SUPER::new (
1219 bg => undef,
1220 @_,
1221 )
1222}
1223
1224sub _draw {
1225 my ($self) = @_;
1226
1227 if ($self->{bg}) {
1228 my ($w, $h) = @$self{qw(w h)};
1229
1230 glEnable GL_BLEND;
1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1232 glColor_premultiply @{ $self->{bg} };
1233 glRect 0, 0, $w, $h;
1234 glDisable GL_BLEND;
1235 }
1236
1237 $self->SUPER::_draw;
1238}
1239
1240#############################################################################
1241
1242package DC::UI::FancyFrame;
1243
1244our @ISA = DC::UI::Bin::;
1245
1246use DC::OpenGL;
1247
1248sub new {
1249 my ($class, %arg) = @_;
1250
1251 if ((exists $arg{label}) && !ref $arg{label}) {
1252 $arg{label} = new DC::UI::Label
1253 align => 1,
1254 valign => 0.5,
1255 text => $arg{label},
1256 fontsize => ($arg{border} || 0.8) * 0.75;
1257 }
775 1258
776 my $self = $class->SUPER::new ( 1259 my $self = $class->SUPER::new (
1260 # label => "",
777 bg => [1, 1, 1, 1], 1261 fg => [0.6, 0.3, 0.1],
778 border_bg => [1, 1, 1, 1],
779 border => 0.8, 1262 border => 0.8,
780 can_events => 1, 1263 style => 'single',
781 @_ 1264 %arg,
782 ); 1265 );
783 1266
784 $self->{title} &&= new CFClient::UI::Label
785 align => 0,
786 valign => 1,
787 text => $self->{title},
788 fontsize => 1;
789
790 $self 1267 $self
1268}
1269
1270sub add {
1271 my ($self, @widgets) = @_;
1272
1273 $self->SUPER::add (@widgets);
1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
791} 1275}
792 1276
793sub border { 1277sub border {
794 int $_[0]{border} * $::FONTSIZE 1278 int $_[0]{border} * $::FONTSIZE
795} 1279}
796 1280
797sub size_request { 1281sub size_request {
798 my ($self) = @_; 1282 my ($self) = @_;
1283
1284 ($self->{label_w}, undef) = $self->{label}->size_request
1285 if $self->{label};
799 1286
800 my ($w, $h) = $self->SUPER::size_request; 1287 my ($w, $h) = $self->SUPER::size_request;
801 1288
802 ( 1289 (
803 $w + $self->border * 2, 1290 $w + $self->border * 2,
804 $h + $self->border * 2, 1291 $h + $self->border * 2,
805 ) 1292 )
806} 1293}
807 1294
808sub size_allocate { 1295sub invoke_size_allocate {
809 my ($self, $w, $h) = @_; 1296 my ($self, $w, $h) = @_;
810 1297
811 $h -= List::Util::max 0, $self->border * 2; 1298 my $border = $self->border;
1299
812 $w -= List::Util::max 0, $self->border * 2; 1300 $w -= List::Util::max 0, $border * 2;
1301 $h -= List::Util::max 0, $border * 2;
813 1302
814 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1303 if (my $label = $self->{label}) {
815 if $self->{title}; 1304 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1305 $label->{h} = List::Util::min $h, $border;
1306 $label->invoke_size_allocate ($label->{w}, $label->{h});
1307 }
816 1308
817 $self->child->configure ($self->border, $self->border, $w, $h); 1309 $self->child->configure ($border, $border, $w, $h);
818}
819 1310
1311 1
1312}
1313
1314sub _draw {
1315 my ($self) = @_;
1316
1317 my $child = $self->{children}[0];
1318
1319 my $border = $self->border;
1320 my ($w, $h) = ($self->{w}, $self->{h});
1321
1322 $child->draw;
1323
1324 glColor @{$self->{fg}};
1325 glBegin GL_LINE_STRIP;
1326 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1327 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1329 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1330 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1331 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1332 glEnd;
1333
1334 if ($self->{label}) {
1335 glTranslate $border * 2, 0;
1336 $self->{label}->_draw;
1337 }
1338}
1339
1340#############################################################################
1341
1342package DC::UI::Toplevel;
1343
1344our @ISA = DC::UI::Bin::;
1345
1346use DC::OpenGL;
1347
1348my $bg =
1349 new_from_resource DC::Texture "d1_bg.png",
1350 mipmap => 1, wrap => 1;
1351
1352my @border =
1353 map { new_from_resource DC::Texture $_, mipmap => 1 }
1354 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1355
1356my @icon =
1357 map { new_from_resource DC::Texture $_, mipmap => 1 }
1358 qw(x1_move.png x1_resize.png);
1359
1360sub new {
1361 my ($class, %arg) = @_;
1362
1363 my $self = $class->SUPER::new (
1364 bg => [1, 1, 1, 1],
1365 border_bg => [1, 1, 1, 1],
1366 border => 1,
1367 can_events => 1,
1368 min_w => 64,
1369 min_h => 32,
1370 %arg,
1371 );
1372
1373 $self->{title_widget} = new DC::UI::Label
1374 align => 0.5,
1375 valign => 1,
1376 text => $self->{title},
1377 fontsize => $self->{border},
1378 if exists $self->{title};
1379
1380 if ($self->{has_close_button}) {
1381 $self->{close_button} =
1382 new DC::UI::ImageButton
1383 path => 'x1_close.png',
1384 on_activate => sub { $self->emit ("delete") };
1385
1386 $self->DC::UI::Container::add ($self->{close_button});
1387 }
1388
1389 $self
1390}
1391
1392sub add {
1393 my ($self, @widgets) = @_;
1394
1395 $self->SUPER::add (@widgets);
1396 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1397 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1398}
1399
1400sub border {
1401 int $_[0]{border} * $::FONTSIZE
1402}
1403
1404sub get_max_wh {
1405 my ($self) = @_;
1406
1407 return ($self->{w}, $self->{h})
1408 if $self->{visible} && $self->{w};
1409
1410 $self->SUPER::get_max_wh
1411}
1412
1413sub size_request {
1414 my ($self) = @_;
1415
1416 $self->{title_widget}->size_request
1417 if $self->{title_widget};
1418
1419 $self->{close_button}->size_request
1420 if $self->{close_button};
1421
1422 my ($w, $h) = $self->SUPER::size_request;
1423
1424 (
1425 $w + $self->border * 2,
1426 $h + $self->border * 2,
1427 )
1428}
1429
1430sub invoke_size_allocate {
1431 my ($self, $w, $h) = @_;
1432
1433 if ($self->{title_widget}) {
1434 $self->{title_widget}{w} = $w;
1435 $self->{title_widget}{h} = $h;
1436 $self->{title_widget}->invoke_size_allocate ($w, $h);
1437 }
1438
1439 my $border = $self->border;
1440
1441 $h -= List::Util::max 0, $border * 2;
1442 $w -= List::Util::max 0, $border * 2;
1443
1444 $self->child->configure ($border, $border, $w, $h);
1445
1446 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1447 if $self->{close_button};
1448
1449 1
1450}
1451
1452sub invoke_delete {
1453 my ($self) = @_;
1454
1455 $self->hide;
1456
1457 1
1458}
1459
820sub button_down { 1460sub invoke_button_down {
821 my ($self, $ev, $x, $y) = @_; 1461 my ($self, $ev, $x, $y) = @_;
822 1462
1463 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 1464 my $border = $self->border;
824 1465
825 if ($x < $self->{w} && $x >= $self->{w} - $border 1466 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 1467 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 1468
1469 if ($lr & $td) {
1470 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1471 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 1472 my ($bw, $bh) = ($self->{w}, $self->{h});
830 1473
1474 my $mx = $x < $border;
1475 my $my = $y < $border;
1476
831 $self->{motion} = sub { 1477 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 1478 my ($ev, $x, $y) = @_;
833 1479
834 ($x, $y) = ($ev->{x}, $ev->{y}); 1480 my $dx = $ev->{x} - $ox;
1481 my $dy = $ev->{y} - $oy;
835 1482
836 $self->{user_w} = $bw + $x - $ox; 1483 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 1484 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
838 $self->check_size; 1485
1486 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1487 $self->realloc;
839 }; 1488 };
840 1489
841 } elsif ($x >= 0 && $x < $self->{w} 1490 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1491 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 1492 my ($bx, $by) = ($self->{x}, $self->{y});
846 1493
847 $self->{motion} = sub { 1494 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 1495 my ($ev, $x, $y) = @_;
849 1496
850 ($x, $y) = ($ev->{x}, $ev->{y}); 1497 ($x, $y) = ($ev->{x}, $ev->{y});
851 1498
852 $self->move ($bx + $x - $ox, $by + $y - $oy); 1499 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
853 $self->update; 1500 # HACK: the next line is required to enforce placement
1501 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
854 }; 1502 };
1503 } else {
1504 return 0;
1505 }
1506
855 } 1507 1
856} 1508}
857 1509
858sub button_up { 1510sub invoke_button_up {
859 my ($self, $ev, $x, $y) = @_; 1511 my ($self, $ev, $x, $y) = @_;
860 1512
861 delete $self->{motion}; 1513 ! ! delete $self->{motion}
862} 1514}
863 1515
864sub mouse_motion { 1516sub invoke_mouse_motion {
865 my ($self, $ev, $x, $y) = @_; 1517 my ($self, $ev, $x, $y) = @_;
866 1518
867 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1519 $self->{motion}->($ev, $x, $y) if $self->{motion};
1520
1521 ! ! $self->{motion}
1522}
1523
1524sub invoke_visibility_change {
1525 my ($self, $visible) = @_;
1526
1527 delete $self->{motion} unless $visible;
1528
1529 0
868} 1530}
869 1531
870sub _draw { 1532sub _draw {
871 my ($self) = @_; 1533 my ($self) = @_;
872 1534
1535 my $child = $self->{children}[0];
1536
873 my ($w, $h ) = ($self->{w}, $self->{h}); 1537 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1538 my ($cw, $ch) = ($child->{w}, $child->{h});
875 1539
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 1540 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 1542
881 my $border = $self->border; 1543 my $border = $self->border;
882 1544
883 glColor @{ $self->{border_bg} }; 1545 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1549 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
888 1550
889 my $bg = $tex[0]; 1551 # move
1552 my $w2 = ($w - $border) * .5;
1553 my $h2 = ($h - $border) * .5;
1554 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
890 1557
1558 # resize
1559 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1561 unless $self->{has_close_button};
1562 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1563 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1564
1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1566 glColor @{ $self->{bg} };
1567
891 # TODO: repeat texture not scale 1568 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 1569 # solve this better(?)
893 my $rep_y = $ch / $bg->{h}; 1570 $bg->{s} = $cw / $bg->{w};
894 1571 $bg->{t} = $ch / $bg->{h};
895 glColor @{ $self->{bg} };
896
897 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 1572 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1573 }
901 1574
902 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 1576
905 $self->{title}->draw if $self->{title};
906 $self->child->draw; 1577 $child->draw;
1578
1579 if ($self->{title_widget}) {
1580 glTranslate 0, $border - $self->{h};
1581 $self->{title_widget}->_draw;
1582
1583 glTranslate 0, - ($border - $self->{h});
1584 }
1585
1586 $self->{close_button}->draw
1587 if $self->{close_button};
907} 1588}
908 1589
909############################################################################# 1590#############################################################################
910 1591
911package CFClient::UI::Table; 1592package DC::UI::Table;
912 1593
913our @ISA = CFClient::UI::Base::; 1594our @ISA = DC::UI::Container::;
914 1595
915use List::Util qw(max sum); 1596use List::Util qw(max sum);
916 1597
917use CFClient::OpenGL; 1598use DC::OpenGL;
918 1599
919sub new { 1600sub new {
920 my $class = shift; 1601 my $class = shift;
921 1602
922 $class->SUPER::new ( 1603 $class->SUPER::new (
923 col_expand => [], 1604 col_expand => [],
1605 row_expand => [],
924 @_ 1606 @_,
925 ) 1607 )
926} 1608}
927 1609
928sub add { 1610sub add {
929 my ($self, $x, $y, $child) = @_;
930
931 $child->set_parent ($self);
932 $self->{children}[$y][$x] = $child;
933
934 $child->check_size;
935}
936
937sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939}
940
941# TODO: move to container class maybe? send childs a signal on removal?
942sub clear {
943 my ($self) = @_; 1611 my ($self, @widgets) = @_;
1612
1613 for my $child (@widgets) {
1614 $child->{c_rowspan} ||= 1;
1615 $child->{c_colspan} ||= 1;
1616 }
1617
1618 $self->SUPER::add (@widgets);
1619}
1620
1621sub add_at {
1622 my $self = shift;
1623
1624 my @widgets;
1625
1626 while (@_) {
1627 my ($col, $row, $child) = splice @_, 0, 3, ();
1628
1629 $child->{c_row} = $row;
1630 $child->{c_col} = $col;
1631
1632 push @widgets, $child;
1633 }
1634
1635 $self->add (@widgets);
1636}
1637
1638sub get_wh {
1639 my ($self) = @_;
1640
1641 my (@w, @h);
944 1642
945 my @children = $self->children; 1643 my @children = $self->children;
946 delete $self->{children}; 1644
1645 # first pass, columns
1646 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1647 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1648
1649 my $sw = sum @w[$c .. $c + $cs - 1];
1650
1651 if ($w > $sw) {
1652 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1653 }
947 1654 }
948 for (@children) {
949 delete $_->{parent};
950 $_->hide;
951 }
952 1655
953 $self->update; 1656 # second pass, rows
954} 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
955
956sub get_wh {
957 my ($self) = @_;
958
959 my (@w, @h);
960
961 for my $y (0 .. $#{$self->{children}}) {
962 my $row = $self->{children}[$y]
963 or next;
964
965 for my $x (0 .. $#$row) {
966 my $widget = $row->[$x]
967 or next;
968 my ($w, $h) = @$widget{qw(req_w req_h)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
969 1659
970 $w[$x] = max $w[$x], $w; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
971 $h[$y] = max $h[$y], $h; 1661
1662 if ($h > $sh) {
1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
972 } 1664 }
973 } 1665 }
974 1666
975 (\@w, \@h) 1667 (\@w, \@h)
976} 1668}
… …
984 (sum @$ws), 1676 (sum @$ws),
985 (sum @$hs), 1677 (sum @$hs),
986 ) 1678 )
987} 1679}
988 1680
989sub size_allocate { 1681sub invoke_size_allocate {
990 my ($self, $w, $h) = @_; 1682 my ($self, $w, $h) = @_;
991 1683
992 my ($ws, $hs) = $self->get_wh; 1684 my ($ws, $hs) = $self->get_wh;
993 1685
994 my $req_w = sum @$ws; 1686 my $req_w = (sum @$ws) || 1;
995 my $req_h = sum @$hs; 1687 my $req_h = (sum @$hs) || 1;
996 1688
997 # TODO: nicer code && do row_expand 1689 # now linearly scale the rows/columns to the allocated size
998 my @col_expand = @{$self->{col_expand}}; 1690 my @col_expand = @{$self->{col_expand}};
999 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1000 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1001 1693
1002 # linearly scale sizes
1003 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1004 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1005 1695
1006 CFClient::UI::harmonize $ws; 1696 DC::UI::harmonize $ws;
1697
1698 my @row_expand = @{$self->{row_expand}};
1699 @row_expand = (1) x @$ws unless @row_expand;
1700 my $row_expand = (sum @row_expand) || 1;
1701
1702 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1703
1007 CFClient::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1008 1705
1009 my $y; 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1010 1708
1011 for my $r (0 .. $#{$self->{children}}) { 1709 for my $widget ($self->children) {
1012 my $row = $self->{children}[$r] 1710 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1013 or next;
1014 1711
1015 my $x = 0; 1712 $widget->configure (
1016 my $row_h = $hs->[$r]; 1713 $x[$c], $y[$r],
1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1017 1715 );
1018 for my $c (0 .. $#$row) { 1716 }
1019 my $col_w = $ws->[$c];
1020 1717
1021 if (my $widget = $row->[$c]) { 1718 1
1022 $widget->configure ($x, $y, $col_w, $row_h); 1719}
1023 }
1024 1720
1025 $x += $col_w; 1721#############################################################################
1722
1723package DC::UI::Fixed;
1724
1725use List::Util qw(min max);
1726
1727our @ISA = DC::UI::Container::;
1728
1729sub _scale($$$) {
1730 my ($rel, $val, $max) = @_;
1731
1732 $rel ? $val * $max : $val
1733}
1734
1735sub size_request {
1736 my ($self) = @_;
1737
1738 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1739
1740 # determine overall size by querying abs widgets
1741 for my $child ($self->visible_children) {
1742 unless ($child->{c_rel}) {
1743 my $x = $child->{c_x};
1744 my $y = $child->{c_y};
1745
1746 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1747 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1026 } 1748 }
1027
1028 $y += $row_h;
1029 } 1749 }
1030 1750
1031} 1751 my $W = $x2 - $x1;
1752 my $H = $y2 - $y1;
1032 1753
1033sub find_widget { 1754 # now layout remaining widgets
1755 for my $child ($self->visible_children) {
1756 if ($child->{c_rel}) {
1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1762 }
1763 }
1764
1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1767
1768 ($W, $H)
1769}
1770
1771sub invoke_size_allocate {
1034 my ($self, $x, $y) = @_; 1772 my ($self, $W, $H) = @_;
1035 1773
1036 $x -= $self->{x}; 1774 for my $child ($self->visible_children) {
1037 $y -= $self->{y}; 1775 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1776 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1038 1777
1039 my $res; 1778 $x += $child->{c_halign} * $child->{req_w};
1779 $y += $child->{c_valign} * $child->{req_h};
1040 1780
1041 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1781 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1042 $res = $_->find_widget ($x, $y) 1782 }
1043 and return $res; 1783
1044 } 1784 1
1045
1046 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1047}
1048
1049sub _draw {
1050 my ($self) = @_;
1051
1052 for (grep $_, @{$self->{children}}) {
1053 $_->draw for grep $_, @$_;
1054 }
1055} 1785}
1056 1786
1057############################################################################# 1787#############################################################################
1058 1788
1059package CFClient::UI::HBox; 1789package DC::UI::Box;
1060 1790
1061# TODO: wrap into common Box base class
1062
1063our @ISA = CFClient::UI::Container::; 1791our @ISA = DC::UI::Container::;
1064 1792
1065sub size_request { 1793sub size_request {
1066 my ($self) = @_; 1794 my ($self) = @_;
1067 1795
1068 my @alloc = map [$_->size_request], @{$self->{children}}; 1796 my @children = $self->visible_children;
1069 1797
1798 $self->{vertical}
1799 ? (
1800 (List::Util::max map $_->{req_w}, @children),
1801 (List::Util::sum map $_->{req_h}, @children),
1802 )
1803 : (
1804 (List::Util::sum map $_->{req_w}, @children),
1805 (List::Util::max map $_->{req_h}, @children),
1806 )
1807}
1808
1809sub invoke_size_allocate {
1810 my ($self, $w, $h) = @_;
1811
1812 my $space = $self->{vertical} ? $h : $w;
1813 my @children = $self->visible_children;
1814
1815 my @req;
1816
1817 if ($self->{homogeneous}) {
1818 @req = ($space / (@children || 1)) x @children;
1819 } else {
1820 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1821 my $req = List::Util::sum @req;
1822
1823 if ($req > $space) {
1824 # ah well, not enough space
1825 $_ *= $space / $req for @req;
1826 } else {
1827 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1828
1829 $space = ($space - $req) / $expand; # remaining space to give away
1830
1831 $req[$_] += $space * $children[$_]{expand}
1832 for 0 .. $#children;
1833 }
1070 ( 1834 }
1071 (List::Util::sum map $_->[0], @alloc), 1835
1072 (List::Util::max map $_->[1], @alloc), 1836 DC::UI::harmonize \@req;
1837
1838 my $pos = 0;
1839 for (0 .. $#children) {
1840 my $alloc = $req[$_];
1841 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1842
1843 $pos += $alloc;
1844 }
1845
1846 1
1847}
1848
1849#############################################################################
1850
1851package DC::UI::HBox;
1852
1853our @ISA = DC::UI::Box::;
1854
1855sub new {
1856 my $class = shift;
1857
1858 $class->SUPER::new (
1859 vertical => 0,
1860 @_,
1073 ) 1861 )
1074} 1862}
1075 1863
1076sub size_allocate {
1077 my ($self, $w, $h) = @_;
1078
1079 ($h, $w) = ($w, $h);
1080
1081 my $children = $self->{children};
1082
1083 my @h = map $_->{req_w}, @$children;
1084
1085 my $req_h = List::Util::sum @h;
1086
1087 if ($req_h > $h) {
1088 # ah well, not enough space
1089 $_ *= $h / $req_h for @h;
1090 } else {
1091 my $exp = List::Util::sum map $_->{expand}, @$children;
1092 $exp ||= 1;
1093
1094 for (0 .. $#$children) {
1095 my $child = $children->[$_];
1096
1097 my $alloc_h = $h[$_];
1098 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1099 $h[$_] = $alloc_h;
1100 }
1101 }
1102
1103 CFClient::UI::harmonize \@h;
1104
1105 my $y = 0;
1106 for (0 .. $#$children) {
1107 my $child = $children->[$_];
1108 my $h = $h[$_];
1109 $child->configure ($y, 0, $h, $w);
1110
1111 $y += $h;
1112 }
1113
1114 1
1115}
1116
1117############################################################################# 1864#############################################################################
1118 1865
1119package CFClient::UI::VBox; 1866package DC::UI::VBox;
1120 1867
1121# TODO: wrap into common Box base class 1868our @ISA = DC::UI::Box::;
1122 1869
1123our @ISA = CFClient::UI::Container::; 1870sub new {
1871 my $class = shift;
1124 1872
1125sub size_request { 1873 $class->SUPER::new (
1126 my ($self) = @_; 1874 vertical => 1,
1127 1875 @_,
1128 my @alloc = map [$_->size_request], @{$self->{children}};
1129
1130 (
1131 (List::Util::max map $_->[0], @alloc),
1132 (List::Util::sum map $_->[1], @alloc),
1133 ) 1876 )
1134} 1877}
1135 1878
1136sub size_allocate {
1137 my ($self, $w, $h) = @_;
1138
1139 my $children = $self->{children};
1140
1141 my @h = map $_->{req_h}, @$children;
1142
1143 my $req_h = List::Util::sum @h;
1144
1145 if ($req_h > $h) {
1146 # ah well, not enough space
1147 $_ *= $h / $req_h for @h;
1148 } else {
1149 my $exp = List::Util::sum map $_->{expand}, @$children;
1150 $exp ||= 1;
1151
1152 for (0 .. $#$children) {
1153 my $child = $children->[$_];
1154
1155 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1156 }
1157 }
1158
1159 CFClient::UI::harmonize \@h;
1160
1161 my $y = 0;
1162 for (0 .. $#$children) {
1163 my $child = $children->[$_];
1164 my $h = $h[$_];
1165 $child->configure (0, $y, $w, $h);
1166
1167 $y += $h;
1168 }
1169
1170 1
1171}
1172
1173############################################################################# 1879#############################################################################
1174 1880
1175package CFClient::UI::Label; 1881package DC::UI::Label;
1176 1882
1177our @ISA = CFClient::UI::Base::; 1883our @ISA = DC::UI::DrawBG::;
1178 1884
1179use CFClient::OpenGL; 1885use DC::OpenGL;
1180 1886
1181sub new { 1887sub new {
1182 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1183 1889
1184 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1891 fg => [1, 1, 1],
1892 #bg => none
1893 #active_bg => none
1186 #font => default_font 1894 #font => default_font
1895 #text => initial text
1896 #markup => initial narkup
1897 #max_w => maximum pixel width
1898 #style => 0, # render flags
1899 ellipsise => 3, # end
1900 layout => (new DC::Layout),
1187 fontsize => 1, 1901 fontsize => 1,
1188 text => "",
1189 align => -1, 1902 align => 0.5,
1190 valign => -1, 1903 valign => 0.5,
1904 padding_x => 4,
1191 padding => 2, 1905 padding_y => 2,
1192 layout => new CFClient::Layout,
1193 can_events => 0, 1906 can_events => 0,
1194 %arg 1907 %arg
1195 ); 1908 );
1196 1909
1197 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1911 my $layout = new DC::Layout;
1199 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1913 $self->{template} = $layout;
1201 } 1914 }
1202 1915
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1916 if (exists $self->{markup}) {
1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1917 $self->set_markup (delete $self->{markup});
1918 } else {
1919 $self->set_text (delete $self->{text});
1920 }
1205 1921
1206 $self 1922 $self
1207}
1208
1209sub escape {
1210 local $_ = $_[1];
1211
1212 s/&/&amp;/g;
1213 s/>/&gt;/g;
1214 s/</&lt;/g;
1215
1216 $_[1]
1217} 1923}
1218 1924
1219sub update { 1925sub update {
1220 my ($self) = @_; 1926 my ($self) = @_;
1221 1927
1222 delete $self->{texture}; 1928 delete $self->{texture};
1223 $self->SUPER::update; 1929 $self->SUPER::update;
1224} 1930}
1225 1931
1226sub reconfigure { 1932sub realloc {
1227 my ($self) = @_; 1933 my ($self) = @_;
1228 1934
1229 delete $self->{texture}; 1935 delete $self->{ox};
1936 $self->SUPER::realloc;
1937}
1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1230} 1943}
1231 1944
1232sub set_text { 1945sub set_text {
1233 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1234 1947
1235 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
1237 1950
1238 $self->{layout}->set_text ($text); 1951 $self->{layout}->set_text ($text);
1239 1952
1240 delete $self->{texture}; 1953 delete $self->{size_req};
1954 $self->realloc;
1241 $self->update; 1955 $self->update;
1242 $self->check_size;
1243} 1956}
1244 1957
1245sub set_markup { 1958sub set_markup {
1246 my ($self, $markup) = @_; 1959 my ($self, $markup) = @_;
1247 1960
1248 return if $self->{text} eq "M$markup"; 1961 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1962 $self->{text} = "M$markup";
1250 1963
1964 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1965
1251 $self->{layout}->set_markup ($markup); 1966 $self->{layout}->set_markup ($markup);
1252 1967
1253 delete $self->{texture}; 1968 delete $self->{size_req};
1969 $self->realloc;
1254 $self->update; 1970 $self->update;
1255 $self->check_size;
1256} 1971}
1257 1972
1258sub size_request { 1973sub size_request {
1259 my ($self) = @_; 1974 my ($self) = @_;
1260 1975
1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264 1984
1265 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1266 1986
1267 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1268 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
1989 $self->{template}->set_width ($max_w);
1269 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1270 1991
1271 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1272 1993
1273 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
1274 $h = List::Util::max $h, $h2; 1995 $h = List::Util::max $h, $h2;
1996 }
1997
1998 [$w, $h]
1275 } 1999 };
1276 2000
1277 ( 2001 @{ $self->{size_req} }
1278 $w + $self->{padding} * 2,
1279 $h + $self->{padding} * 2,
1280 )
1281} 2002}
1282 2003
2004sub baseline_shift {
2005 $_[0]{layout}->descent
2006}
2007
1283sub size_allocate { 2008sub invoke_size_allocate {
1284 my ($self, $w, $h) = @_; 2009 my ($self, $w, $h) = @_;
1285 2010
2011 delete $self->{ox};
2012
1286 delete $self->{texture}; 2013 delete $self->{texture}
2014 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2015
2016 1
1287} 2017}
1288 2018
1289sub set_fontsize { 2019sub set_fontsize {
1290 my ($self, $fontsize) = @_; 2020 my ($self, $fontsize) = @_;
1291 2021
1292 $self->{fontsize} = $fontsize; 2022 $self->{fontsize} = $fontsize;
2023 delete $self->{size_req};
1293 delete $self->{texture}; 2024 delete $self->{texture};
1294 $self->check_size; 2025
1295 $self->update; 2026 $self->realloc;
2027}
2028
2029sub reconfigure {
2030 my ($self) = @_;
2031
2032 delete $self->{size_req};
2033 delete $self->{texture};
2034
2035 $self->SUPER::reconfigure;
1296} 2036}
1297 2037
1298sub _draw { 2038sub _draw {
1299 my ($self) = @_; 2039 my ($self) = @_;
1300 2040
2041 $self->SUPER::_draw; # draw background, if applicable
2042
1301 my $tex = $self->{texture} ||= do { 2043 my $size = $self->{texture} ||= do {
2044 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2045 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{w}); 2046 $self->{layout}->set_width ($self->{w});
2047 $self->{layout}->set_ellipsise ($self->{ellipsise});
2048 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 2049 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 new_from_layout CFClient::Texture $self->{layout} 2050
2051 [$self->{layout}->size]
1306 }; 2052 };
1307 2053
1308 glEnable GL_BLEND; 2054 unless (exists $self->{ox}) {
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2055 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1310 glEnable GL_TEXTURE_2D; 2056 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 2057
1313 glColor @{$self->{fg}}; 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 ); 2059 };
1320 2060
1321 $self->{oy} = int ( 2061# unless ($self->{list}) {
1322 $self->{valign} < 0 ? $self->{padding} 2062# $self->{list} = DC::OpenGL::glGenList;
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 2063# DC::OpenGL::glNewList $self->{list};
1324 : ($self->{h} - $tex->{h}) * 0.5 2064# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1325 ); 2065# DC::OpenGL::glEndList;
2066# }
2067#
2068# DC::OpenGL::glCallList $self->{list};
1326 2069
1327 $tex->draw_quad ($self->{ox}, $self->{oy}); 2070 $self->{layout}->draw;
1328
1329 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 2071}
2072
2073#sub destroy {
2074# my ($self) = @_;
2075#
2076# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2077#
2078# $self->SUPER::destroy;
2079#}
1332 2080
1333############################################################################# 2081#############################################################################
1334 2082
1335package CFClient::UI::EntryBase; 2083package DC::UI::EntryBase;
1336 2084
1337our @ISA = CFClient::UI::Label::; 2085our @ISA = DC::UI::Label::;
1338 2086
1339use CFClient::OpenGL; 2087use DC::OpenGL;
1340 2088
1341sub new { 2089sub new {
1342 my $class = shift; 2090 my $class = shift;
1343 2091
1344 $class->SUPER::new ( 2092 $class->SUPER::new (
1345 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
1346 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
1347 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
1348 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
1349 can_hover => 1, 2099 can_hover => 1,
1350 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
1351 valign => 0, 2102 valign => 0.5,
1352 can_events => 1, 2103 can_events => 1,
2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
2107 #text => ...
2108 #hidden => "*",
1353 @_ 2109 @_
1354 ) 2110 )
1355} 2111}
1356 2112
1357sub _set_text { 2113sub _set_text {
… …
1359 2115
1360 delete $self->{cur_h}; 2116 delete $self->{cur_h};
1361 2117
1362 return if $self->{text} eq $text; 2118 return if $self->{text} eq $text;
1363 2119
1364 delete $self->{texture};
1365
1366 $self->{last_activity} = $::NOW; 2120 $self->{last_activity} = $::NOW;
1367 $self->{text} = $text; 2121 $self->{text} = $text;
1368 2122
1369 $text =~ s/./*/g if $self->{hidden}; 2123 $text =~ s/./*/g if $self->{hidden};
1370 $self->{layout}->set_text ("$text "); 2124 $self->{layout}->set_text ("$text ");
2125 delete $self->{size_req};
1371 2126
1372 $self->emit (changed => $self->{text}); 2127 $self->emit (changed => $self->{text});
2128
2129 $self->realloc;
2130 $self->update;
2131}
2132
2133sub set_text {
2134 my ($self, $text) = @_;
2135
2136 $self->{cursor} = length $text;
2137 $self->_set_text ($text);
1373} 2138}
1374 2139
1375sub get_text { 2140sub get_text {
1376 $_[0]{text} 2141 $_[0]{text}
1377} 2142}
… …
1382 my ($w, $h) = $self->SUPER::size_request; 2147 my ($w, $h) = $self->SUPER::size_request;
1383 2148
1384 ($w + 1, $h) # add 1 for cursor 2149 ($w + 1, $h) # add 1 for cursor
1385} 2150}
1386 2151
1387sub size_allocate {
1388 my ($self, $w, $h) = @_;
1389
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391}
1392
1393sub set_text {
1394 my ($self, $text) = @_;
1395
1396 $self->{cursor} = length $text;
1397 $self->_set_text ($text);
1398 $self->update;
1399}
1400
1401sub key_down { 2152sub invoke_key_down {
1402 my ($self, $ev) = @_; 2153 my ($self, $ev) = @_;
1403 2154
1404 my $mod = $ev->{mod}; 2155 my $mod = $ev->{mod};
1405 my $sym = $ev->{sym}; 2156 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 2157 my $uni = $ev->{unicode};
1407 2158
1408 my $text = $self->get_text; 2159 my $text = $self->get_text;
1409 2160
1410 if ($sym == 8) { 2161 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2162
2163 if ($sym == DC::SDLK_BACKSPACE) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 2165 } elsif ($sym == DC::SDLK_DELETE) {
1413 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) { 2171 } elsif ($sym == DC::SDLK_HOME) {
2172 # what a hack
2173 $self->{cursor} =
2174 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2175 ? length $1
2176 : 0;
2177 } elsif ($sym == DC::SDLK_END) {
2178 # uh, again
2179 $self->{cursor} =
2180 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2181 ? $self->{cursor} + length $1
2182 : length $self->{text};
2183 } elsif ($uni == 21) { # ctrl-u
2184 $text = "";
1419 $self->{cursor} = 0; 2185 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 2186 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 2187 $self->emit ('escape');
1424 } elsif ($uni) { 2188 } elsif ($uni == 0x0d) {
2189 substr $text, $self->{cursor}++, 0, "\012";
2190 } elsif ($uni >= 0x20) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 2191 substr $text, $self->{cursor}++, 0, chr $uni;
2192 } else {
2193 return 0;
1426 } 2194 }
1427 2195
1428 $self->_set_text ($text); 2196 $self->_set_text ($text);
2197
2198 $self->realloc;
1429 $self->update; 2199 $self->update;
1430}
1431 2200
2201 1
2202}
2203
1432sub focus_in { 2204sub invoke_focus_in {
1433 my ($self) = @_; 2205 my ($self) = @_;
1434 2206
1435 $self->{last_activity} = $::NOW; 2207 $self->{last_activity} = $::NOW;
1436 2208
1437 $self->SUPER::focus_in; 2209 $self->SUPER::invoke_focus_in
1438} 2210}
1439 2211
1440sub button_down { 2212sub invoke_button_down {
1441 my ($self, $ev, $x, $y) = @_; 2213 my ($self, $ev, $x, $y) = @_;
1442 2214
1443 $self->SUPER::button_down ($ev, $x, $y); 2215 $self->SUPER::invoke_button_down ($ev, $x, $y);
1444 2216
1445 my $idx = $self->{layout}->xy_to_index ($x, $y); 2217 my $idx = $self->{layout}->xy_to_index ($x, $y);
1446 2218
1447 # byte-index to char-index 2219 # byte-index to char-index
1448 my $text = $self->{text}; 2220 my $text = $self->{text};
1449 utf8::encode $text; 2221 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1450 $self->{cursor} = length substr $text, 0, $idx; 2222 $self->{cursor} = length $text;
1451 2223
1452 $self->_set_text ($self->{text}); 2224 $self->_set_text ($self->{text});
1453 $self->update; 2225 $self->update;
2226
2227 1
1454} 2228}
1455 2229
1456sub mouse_motion { 2230sub invoke_mouse_motion {
1457 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
1458# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2232# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2233
2234 1
1459} 2235}
1460 2236
1461sub _draw { 2237sub _draw {
1462 my ($self) = @_; 2238 my ($self) = @_;
1463 2239
1464 local $self->{fg} = $self->{fg}; 2240 local $self->{fg} = $self->{fg};
1465 2241
1466 if ($FOCUS == $self) { 2242 if ($FOCUS == $self) {
1467 glColor @{$self->{active_bg}}; 2243 glColor_premultiply @{$self->{active_bg}};
1468 $self->{fg} = $self->{active_fg}; 2244 $self->{fg} = $self->{active_fg};
1469 } else { 2245 } else {
1470 glColor @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
1471 } 2247 }
1472 2248
1473 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
1474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1475 glBegin GL_QUADS;
1476 glVertex 0 , 0;
1477 glVertex 0 , $self->{h};
1478 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
1479 glVertex $self->{w}, 0;
1480 glEnd;
1481 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
1482 2253
1483 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
1484 2255
1485 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
… …
1487 2258
1488 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
1489 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
1490 utf8::encode $text; 2261 utf8::encode $text;
1491 2262
1492 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2263 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1493 } 2264 }
1494 2265
1495 glColor @{$self->{fg}}; 2266 glColor_premultiply @{$self->{active_fg}};
1496 glBegin GL_LINES; 2267 glBegin GL_LINES;
1497 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1498 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2269 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1499 glEnd; 2270 glEnd;
1500 }
1501}
1502 2271
2272 glLineWidth 3;
2273 glColor @{$self->{active_outline}};
2274 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2275 glLineWidth 1;
2276
2277 } else {
2278 glColor @{$self->{outline}};
2279 glBegin GL_LINE_STRIP;
2280 glVertex .5, $self->{h} * .5;
2281 glVertex .5, $self->{h} - 2.5;
2282 glVertex $self->{w} - .5, $self->{h} - 2.5;
2283 glVertex $self->{w} - .5, $self->{h} * .5;
2284 glEnd;
2285 }
2286}
2287
2288#############################################################################
2289
1503package CFClient::UI::Entry; 2290package DC::UI::Entry;
1504 2291
1505our @ISA = CFClient::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
1506 2293
1507use CFClient::OpenGL; 2294use DC::OpenGL;
1508 2295
2296sub new {
2297 my $class = shift;
2298
2299 $class->SUPER::new (
2300 history_pointer => -1,
2301 @_
2302 )
2303}
2304
2305
1509sub key_down { 2306sub invoke_key_down {
1510 my ($self, $ev) = @_; 2307 my ($self, $ev) = @_;
1511 2308
1512 my $sym = $ev->{sym}; 2309 my $sym = $ev->{sym};
1513 2310
1514 if ($sym == 13) { 2311 if ($ev->{uni} == 0x0d || $sym == 13) {
1515 unshift @{$self->{history}}, 2312 unshift @{$self->{history}},
1516 my $txt = $self->get_text; 2313 my $txt = $self->get_text;
2314
1517 $self->{history_pointer} = -1; 2315 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = ''; 2316 $self->{history_saveback} = '';
1519 $self->emit (activate => $txt); 2317 $self->emit (activate => $txt);
1520 $self->update; 2318 $self->update;
1521 2319
1522 } elsif ($sym == CFClient::SDLK_UP) { 2320 } elsif ($sym == DC::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) { 2321 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text; 2322 $self->{history_saveback} = $self->get_text;
1525 } 2323 }
1526 if (@{$self->{history} || []} > 0) { 2324 if (@{$self->{history} || []} > 0) {
1527 $self->{history_pointer}++; 2325 $self->{history_pointer}++;
… …
1529 $self->{history_pointer} = @{$self->{history} || []} - 1; 2327 $self->{history_pointer} = @{$self->{history} || []} - 1;
1530 } 2328 }
1531 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2329 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1532 } 2330 }
1533 2331
1534 } elsif ($sym == CFClient::SDLK_DOWN) { 2332 } elsif ($sym == DC::SDLK_DOWN) {
1535 $self->{history_pointer}--; 2333 $self->{history_pointer}--;
1536 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2334 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1537 2335
1538 if ($self->{history_pointer} >= 0) { 2336 if ($self->{history_pointer} >= 0) {
1539 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2337 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1540 } else { 2338 } else {
2339 if (defined $self->{history_saveback}) {
1541 $self->set_text ($self->{history_saveback}); 2340 $self->set_text ($self->{history_saveback});
2341 $self->{history_saveback} = undef;
2342 }
1542 } 2343 }
1543 2344
1544 } else { 2345 } else {
1545 $self->SUPER::key_down ($ev); 2346 return $self->SUPER::invoke_key_down ($ev)
2347 }
2348
1546 } 2349 1
1547
1548} 2350}
1549 2351
1550############################################################################# 2352#############################################################################
1551 2353
1552package CFClient::UI::Button; 2354package DC::UI::TextEdit;
1553 2355
1554our @ISA = CFClient::UI::Label::; 2356our @ISA = DC::UI::EntryBase::;
1555 2357
1556use CFClient::OpenGL; 2358use DC::OpenGL;
1557
1558my @tex =
1559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1560 qw(b1_button_active.png);
1561 2359
1562sub new { 2360sub new {
1563 my $class = shift; 2361 my $class = shift;
1564 2362
1565 $class->SUPER::new ( 2363 $class->SUPER::new (
1566 padding => 4, 2364 padding_y => 4,
1567 fg => [1, 1, 1], 2365
1568 bg => [1, 1, 1, 0.2], 2366 @_
1569 active_fg => [0, 0, 1], 2367 )
2368}
2369
2370sub move_cursor_ver {
2371 my ($self, $dy) = @_;
2372
2373 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2374
2375 $line += $dy;
2376
2377 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2378 $self->{cursor} = $index;
2379 delete $self->{cur_h};
2380 $self->update;
2381 return;
2382 }
2383}
2384
2385sub invoke_key_down {
2386 my ($self, $ev) = @_;
2387
2388 my $sym = $ev->{sym};
2389
2390 if ($sym == DC::SDLK_UP) {
2391 $self->move_cursor_ver (-1);
2392 } elsif ($sym == DC::SDLK_DOWN) {
2393 $self->move_cursor_ver (+1);
2394 } else {
2395 return $self->SUPER::invoke_key_down ($ev)
2396 }
2397
2398 1
2399}
2400
2401#############################################################################
2402
2403package DC::UI::ButtonBin;
2404
2405our @ISA = DC::UI::Bin::;
2406
2407use DC::OpenGL;
2408
2409my @tex =
2410 map { new_from_resource DC::Texture $_, mipmap => 1 }
2411 qw(b1_button_inactive.png b1_button_active.png);
2412
2413sub new {
2414 my $class = shift;
2415
2416 $class->SUPER::new (
1570 can_hover => 1, 2417 can_hover => 1,
1571 align => 0, 2418 align => 0.5,
1572 valign => 0, 2419 valign => 0.5,
1573 can_events => 1, 2420 can_events => 1,
1574 @_ 2421 @_
1575 ) 2422 )
1576} 2423}
1577 2424
1578sub button_up { 2425sub invoke_button_up {
1579 my ($self, $ev, $x, $y) = @_; 2426 my ($self, $ev, $x, $y) = @_;
1580 2427
2428 $self->emit ("activate")
1581 if ($x >= 0 && $x < $self->{w} 2429 if $x >= 0 && $x < $self->{w}
1582 && $y >= 0 && $y < $self->{h}) { 2430 && $y >= 0 && $y < $self->{h};
1583 $self->emit ("activate"); 2431
1584 } 2432 1
1585} 2433}
1586 2434
1587sub _draw { 2435sub _draw {
1588 my ($self) = @_; 2436 my ($self) = @_;
1589 2437
1590 local $self->{fg} = $self->{fg};
1591
1592 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg};
1594 }
1595
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 2438 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 2440 glColor 0, 0, 0, 1;
1601 2441
2442 my $tex = $tex[$GRAB == $self];
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 2443 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 2444
1604 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 2446
1607 $self->SUPER::_draw; 2447 $self->SUPER::_draw;
1608} 2448}
1609 2449
1610############################################################################# 2450#############################################################################
1611 2451
1612package CFClient::UI::CheckBox; 2452package DC::UI::Button;
1613 2453
1614our @ISA = CFClient::UI::DrawBG::; 2454our @ISA = DC::UI::Label::;
2455
2456use DC::OpenGL;
1615 2457
1616my @tex = 2458my @tex =
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2459 map { new_from_resource DC::Texture $_, mipmap => 1 }
1618 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2460 qw(b1_button_inactive.png b1_button_active.png);
1619
1620use CFClient::OpenGL;
1621 2461
1622sub new { 2462sub new {
1623 my $class = shift; 2463 my $class = shift;
1624 2464
1625 $class->SUPER::new ( 2465 $class->SUPER::new (
2466 padding_x => 8,
2467 padding_y => 4,
2468 fg => [1.0, 1.0, 1.0],
2469 active_fg => [0.8, 0.8, 0.8],
2470 can_hover => 1,
2471 align => 0.5,
2472 valign => 0.5,
2473 can_events => 1,
2474 @_
2475 )
2476}
2477
2478sub invoke_button_up {
2479 my ($self, $ev, $x, $y) = @_;
2480
2481 $self->emit ("activate")
2482 if $x >= 0 && $x < $self->{w}
2483 && $y >= 0 && $y < $self->{h};
2484
2485 1
2486}
2487
2488sub _draw {
2489 my ($self) = @_;
2490
2491 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2492
2493 glEnable GL_TEXTURE_2D;
2494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2495 glColor 0, 0, 0, 1;
2496
2497 my $tex = $tex[$GRAB == $self];
2498 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499
2500 glDisable GL_TEXTURE_2D;
2501
2502 $self->SUPER::_draw;
2503}
2504
2505#############################################################################
2506
2507package DC::UI::CheckBox;
2508
2509our @ISA = DC::UI::DrawBG::;
2510
2511my @tex =
2512 map { new_from_resource DC::Texture $_, mipmap => 1 }
2513 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2514
2515use DC::OpenGL;
2516
2517sub new {
2518 my $class = shift;
2519
2520 $class->SUPER::new (
1626 padding => 2, 2521 padding_x => 2,
2522 padding_y => 2,
1627 fg => [1, 1, 1], 2523 fg => [1, 1, 1],
1628 active_fg => [1, 1, 0], 2524 active_fg => [1, 1, 0],
2525 bg => [0, 0, 0, 0.2],
2526 active_bg => [1, 1, 1, 0.5],
1629 state => 0, 2527 state => 0,
1630 can_hover => 1, 2528 can_hover => 1,
1631 @_ 2529 @_
1632 ) 2530 )
1633} 2531}
1634 2532
1635sub size_request { 2533sub size_request {
1636 my ($self) = @_; 2534 my ($self) = @_;
1637 2535
1638 ($self->{padding} * 2 + 6) x 2 2536 (6) x 2
1639} 2537}
1640 2538
2539sub toggle {
2540 my ($self) = @_;
2541
2542 $self->{state} = !$self->{state};
2543 $self->emit (changed => $self->{state});
2544 $self->update;
2545}
2546
1641sub button_down { 2547sub invoke_button_down {
1642 my ($self, $ev, $x, $y) = @_; 2548 my ($self, $ev, $x, $y) = @_;
1643 2549
1644 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2550 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1645 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2551 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1646 $self->{state} = !$self->{state}; 2552 $self->toggle;
1647 $self->emit (changed => $self->{state}); 2553 } else {
2554 return 0
2555 }
2556
1648 } 2557 1
1649} 2558}
1650 2559
1651sub _draw { 2560sub _draw {
1652 my ($self) = @_; 2561 my ($self) = @_;
1653 2562
1654 $self->SUPER::_draw; 2563 $self->SUPER::_draw;
1655 2564
1656 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2565 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
1657 2566
1658 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2567 my ($w, $h) = @$self{qw(w h)};
2568
2569 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1659 2570
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2571 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 2572
1662 glEnable GL_BLEND; 2573 my $tex = $self->{state} ? $tex[1] : $tex[0];
2574
1663 glEnable GL_TEXTURE_2D; 2575 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 2576 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 2577 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 2578}
1673 2579
1674############################################################################# 2580#############################################################################
1675 2581
1676package CFClient::UI::Image; 2582package DC::UI::Image;
1677 2583
1678our @ISA = CFClient::UI::Base::; 2584our @ISA = DC::UI::Base::;
1679 2585
1680use CFClient::OpenGL; 2586use DC::OpenGL;
1681use Carp qw/confess/;
1682 2587
1683our %loaded_images; 2588our %texture_cache;
1684 2589
1685sub new { 2590sub new {
1686 my $class = shift; 2591 my $class = shift;
1687 2592
1688 my $self = $class->SUPER::new (can_events => 0, @_); 2593 my $self = $class->SUPER::new (
2594 can_events => 0,
2595 scale => 1,
2596 @_,
2597 );
1689 2598
1690 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2599 $self->{path} || $self->{tex}
2600 or Carp::croak "'path' or 'tex' attributes required";
1691 2601
1692 $loaded_images{$self->{image}} ||= 2602 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1693 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2603 new_from_resource DC::Texture $self->{path}, mipmap => 1;
1694 2604
1695 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2605 DC::weaken $texture_cache{$self->{path}};
1696 2606
1697 Scalar::Util::weaken $loaded_images{$self->{image}}; 2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1698
1699 $self->{aspect} = $tex->{w} / $tex->{h};
1700 2608
1701 $self 2609 $self
1702} 2610}
1703 2611
2612sub STORABLE_freeze {
2613 my ($self, $cloning) = @_;
2614
2615 $self->{path}
2616 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2617
2618 $self->{path}
2619}
2620
2621sub STORABLE_attach {
2622 my ($self, $cloning, $path) = @_;
2623
2624 $self->new (path => $path)
2625}
2626
1704sub size_request { 2627sub size_request {
1705 my ($self) = @_; 2628 my ($self) = @_;
1706 2629
1707 ($self->{tex}->{w}, $self->{tex}->{h}) 2630 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
1708} 2631}
1709 2632
1710sub _draw { 2633sub _draw {
1711 my ($self) = @_; 2634 my ($self) = @_;
1712 2635
… …
1719 glTranslate 0, -$self->{w}, 0; 2642 glTranslate 0, -$self->{w}, 0;
1720 2643
1721 ($w, $h) = ($h, $w); 2644 ($w, $h) = ($h, $w);
1722 } 2645 }
1723 2646
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 2647 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 2649
1729 $tex->draw_quad (0, 0, $w, $h); 2650 $tex->draw_quad_alpha (0, 0, $w, $h);
1730 2651
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
1733} 2653}
1734 2654
1735############################################################################# 2655#############################################################################
1736 2656
2657package DC::UI::ImageButton;
2658
2659our @ISA = DC::UI::Image::;
2660
2661use DC::OpenGL;
2662
2663my %textures;
2664
2665sub new {
2666 my $class = shift;
2667
2668 my $self = $class->SUPER::new (
2669 padding_x => 4,
2670 padding_y => 4,
2671 fg => [1, 1, 1],
2672 active_fg => [0, 0, 1],
2673 can_hover => 1,
2674 align => 0.5,
2675 valign => 0.5,
2676 can_events => 1,
2677 @_
2678 );
2679}
2680
2681sub invoke_button_down {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 1
2685}
2686
2687sub invoke_button_up {
2688 my ($self, $ev, $x, $y) = @_;
2689
2690 $self->emit ("activate")
2691 if $x >= 0 && $x < $self->{w}
2692 && $y >= 0 && $y < $self->{h};
2693
2694 1
2695}
2696
2697#############################################################################
2698
1737package CFClient::UI::VGauge; 2699package DC::UI::VGauge;
1738 2700
1739our @ISA = CFClient::UI::Base::; 2701our @ISA = DC::UI::Base::;
1740 2702
1741use List::Util qw(min max); 2703use List::Util qw(min max);
1742 2704
1743use CFClient::OpenGL; 2705use DC::OpenGL;
1744 2706
1745my %tex = ( 2707my %tex = (
1746 food => [ 2708 food => [
1747 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2709 map { new_from_resource DC::Texture $_, mipmap => 1 }
1748 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1749 ], 2711 ],
1750 grace => [ 2712 grace => [
1751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2713 map { new_from_resource DC::Texture $_, mipmap => 1 }
1752 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2714 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1753 ], 2715 ],
1754 hp => [ 2716 hp => [
1755 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
1756 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1757 ], 2719 ],
1758 mana => [ 2720 mana => [
1759 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
1760 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2722 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1761 ], 2723 ],
1762); 2724);
1763 2725
1764# eg. VGauge->new (gauge => 'food'), default gauge: food 2726# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1824 my $ycut1 = max 0, min 1, $ycut; 2786 my $ycut1 = max 0, min 1, $ycut;
1825 my $ycut2 = max 0, min 1, $ycut - 1; 2787 my $ycut2 = max 0, min 1, $ycut - 1;
1826 2788
1827 my $h1 = $self->{h} * (1 - $ycut1); 2789 my $h1 = $self->{h} * (1 - $ycut1);
1828 my $h2 = $self->{h} * (1 - $ycut2); 2790 my $h2 = $self->{h} * (1 - $ycut2);
2791 my $h3 = $self->{h};
2792
2793 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1829 2794
1830 glEnable GL_BLEND; 2795 glEnable GL_BLEND;
1831 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2796 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2797 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1832 glEnable GL_TEXTURE_2D; 2798 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 2800
1835 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2801 glBindTexture GL_TEXTURE_2D, $t1->{name};
1836 glBegin GL_QUADS; 2802 glBegin GL_QUADS;
… …
1851 2817
1852 if ($t3) { 2818 if ($t3) {
1853 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2819 glBindTexture GL_TEXTURE_2D, $t3->{name};
1854 glBegin GL_QUADS; 2820 glBegin GL_QUADS;
1855 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2821 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1856 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2822 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1857 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2823 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1858 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2824 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1859 glEnd; 2825 glEnd;
1860 } 2826 }
1861 2827
1862 glDisable GL_BLEND; 2828 glDisable GL_BLEND;
1863 glDisable GL_TEXTURE_2D; 2829 glDisable GL_TEXTURE_2D;
1864} 2830}
1865 2831
1866############################################################################# 2832#############################################################################
1867 2833
2834package DC::UI::Progress;
2835
2836our @ISA = DC::UI::Label::;
2837
2838use DC::OpenGL;
2839
2840sub new {
2841 my ($class, %arg) = @_;
2842
2843 my $self = $class->SUPER::new (
2844 fg => [1, 1, 1],
2845 bg => [0, 0, 1, 0.2],
2846 bar => [0.7, 0.5, 0.1, 0.8],
2847 outline => [0.4, 0.3, 0],
2848 fontsize => 0.9,
2849 valign => 0.5,
2850 align => 0.5,
2851 can_events => 1,
2852 ellipsise => 1,
2853 label => "%d%%",
2854 %arg,
2855 );
2856
2857 $self->set_value ($arg{value} || -1);
2858
2859 $self
2860}
2861
2862sub set_label {
2863 my ($self, $label) = @_;
2864
2865 return if $self->{label} eq $label;
2866 $self->{label} = $label;
2867
2868 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2869}
2870
2871sub set_value {
2872 my ($self, $value) = @_;
2873
2874 if ($self->{value} ne $value) {
2875 $self->{value} = $value;
2876
2877 if ($value < 0) {
2878 $self->set_text ("-");
2879 } else {
2880 $self->set_text (sprintf $self->{label}, $value * 100);
2881 }
2882
2883 $self->update;
2884 }
2885}
2886
2887sub _draw {
2888 my ($self) = @_;
2889
2890 glEnable GL_BLEND;
2891 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2892
2893 if ($self->{value} >= 0) {
2894 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2895
2896 glColor_premultiply @{$self->{bar}};
2897 glRect 2, 2, $s, $self->{h} - 2;
2898 glColor_premultiply @{$self->{bg}};
2899 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2900 }
2901
2902 glColor_premultiply @{$self->{outline}};
2903 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2904
2905 glDisable GL_BLEND;
2906
2907 {
2908 local $self->{bg}; # do not draw background
2909 $self->SUPER::_draw;
2910 }
2911}
2912
2913#############################################################################
2914
2915package DC::UI::ExperienceProgress;
2916
2917our @ISA = DC::UI::Progress::;
2918
2919sub new {
2920 my ($class, %arg) = @_;
2921
2922 my $self = $class->SUPER::new (
2923 tooltip => sub {
2924 my ($self) = @_;
2925
2926 sprintf "level %d\n%s points\n%s next level\n%s to go",
2927 $self->{lvl},
2928 ::formsep ($self->{exp}),
2929 ::formsep ($self->{nxt}),
2930 ::formsep ($self->{nxt} - $self->{exp}),
2931 },
2932 %arg
2933 );
2934
2935 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2936 if $::CONN;
2937
2938 $self
2939}
2940
2941sub DESTROY {
2942 my ($self) = @_;
2943
2944 delete $::CONN->{on_exp_update}{$self+0}
2945 if $::CONN;
2946
2947 $self->SUPER::DESTROY;
2948}
2949
2950sub set_value {
2951 my ($self, $lvl, $exp) = @_;
2952
2953 $self->{lvl} = $lvl;
2954 $self->{exp} = $exp;
2955
2956 my $v = -1;
2957
2958 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2959 my $l0 = $table->[$lvl - 1];
2960 my $l1 = $table->[$lvl];
2961
2962 $self->{nxt} = $l1;
2963
2964 $v = ($exp - $l0) / ($l1 - $l0);
2965 }
2966
2967 $self->SUPER::set_value ($v);
2968}
2969
2970#############################################################################
2971
1868package CFClient::UI::Gauge; 2972package DC::UI::Gauge;
1869 2973
1870our @ISA = CFClient::UI::VBox::; 2974our @ISA = DC::UI::VBox::;
1871 2975
1872sub new { 2976sub new {
1873 my ($class, %arg) = @_; 2977 my ($class, %arg) = @_;
1874 2978
1875 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
… …
1877 can_hover => 1, 2981 can_hover => 1,
1878 can_events => 1, 2982 can_events => 1,
1879 %arg, 2983 %arg,
1880 ); 2984 );
1881 2985
1882 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2986 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
1883 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2987 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1884 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2988 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
1885 2989
1886 $self 2990 $self
1887} 2991}
1888 2992
1889sub set_fontsize { 2993sub set_fontsize {
… …
1910 $self->{value}->set_text ($val); 3014 $self->{value}->set_text ($val);
1911} 3015}
1912 3016
1913############################################################################# 3017#############################################################################
1914 3018
1915package CFClient::UI::Slider; 3019package DC::UI::Slider;
1916 3020
1917use strict; 3021use strict;
1918 3022
1919use CFClient::OpenGL; 3023use DC::OpenGL;
1920 3024
1921our @ISA = CFClient::UI::DrawBG::; 3025our @ISA = DC::UI::DrawBG::;
1922 3026
1923my @tex = 3027my @tex =
1924 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3028 map { new_from_resource DC::Texture $_ }
1925 qw(s1_slider.png s1_slider_bg.png); 3029 qw(s1_slider.png s1_slider_bg.png);
1926 3030
1927sub new { 3031sub new {
1928 my $class = shift; 3032 my $class = shift;
1929 3033
1930 # range [value, low, high, page] 3034 # range [value, low, high, page, unit]
1931 3035
1932 # TODO: 0-width page 3036 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical 3037 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off 3038 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 3039 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 3040 fg => [1, 1, 1],
1937 active_fg => [0, 0, 0], 3041 active_fg => [0, 0, 0],
3042 bg => [0, 0, 0, 0.2],
3043 active_bg => [1, 1, 1, 0.5],
1938 range => [0, 0, 100, 10], 3044 range => [0, 0, 100, 10, 0],
1939 req_w => 20, 3045 min_w => $::WIDTH / 80,
1940 req_h => 20, 3046 min_h => $::WIDTH / 80,
1941 vertical => 0, 3047 vertical => 0,
1942 can_hover => 1, 3048 can_hover => 1,
1943 inner_pad => 5, 3049 inner_pad => 0.02,
1944 @_ 3050 @_
1945 ); 3051 );
1946 3052
3053 $self->set_value ($self->{range}[0]);
3054 $self->update;
3055
1947 $self 3056 $self
1948} 3057}
1949 3058
3059sub set_range {
3060 my ($self, $range) = @_;
3061
3062 ($range, $self->{range}) = ($self->{range}, $range);
3063
3064 if ("@$range" ne "@{$self->{range}}") {
3065 $self->update;
3066 $self->set_value ($self->{range}[0]);
3067 }
3068}
3069
3070sub set_value {
3071 my ($self, $value) = @_;
3072
3073 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
3074
3075 $hi = $lo if $hi < $lo;
3076
3077 $value = $hi - $page if $value > $hi - $page;
3078 $value = $lo if $value < $lo;
3079
3080 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
3081 if $unit;
3082
3083 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
3084
3085 if ($value != $old_value) {
3086 $self->emit (changed => $value);
3087 $self->update;
3088 }
3089}
3090
1950sub size_request { 3091sub size_request {
1951 my ($self) = @_; 3092 my ($self) = @_;
1952 3093
1953 my $w = $self->{req_w}; 3094 ($self->{req_w}, $self->{req_h})
1954 my $h = $self->{req_h};
1955
1956 $self->{vertical} ? ($h, $w) : ($w, $h)
1957} 3095}
1958 3096
1959sub button_down { 3097sub invoke_button_down {
1960 my ($self, $ev, $x, $y) = @_; 3098 my ($self, $ev, $x, $y) = @_;
1961 3099
1962 $self->SUPER::button_down ($ev, $x, $y); 3100 $self->SUPER::invoke_button_down ($ev, $x, $y);
3101
3102 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
3103
1963 $self->mouse_motion ($ev, $x, $y); 3104 $self->invoke_mouse_motion ($ev, $x, $y);
1964}
1965 3105
3106 1
3107}
3108
1966sub mouse_motion { 3109sub invoke_mouse_motion {
1967 my ($self, $ev, $x, $y) = @_; 3110 my ($self, $ev, $x, $y) = @_;
1968 3111
1969 if ($GRAB == $self) { 3112 if ($GRAB == $self) {
1970 my ($value, $lo, $hi, $page) = @{$self->{range}};
1971
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3113 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1973 3114
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 3115 my (undef, $lo, $hi, $page) = @{$self->{range}};
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1976 3116
1977 $x -= $inner_pad_px; # substract the padding 3117 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
1978 $x = $x * ($hi - $lo) / $inner_w + $lo;
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982 3118
1983 $self->emit (changed => $x); 3119 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
1984 $self->update; 3120 } else {
3121 return 0;
3122 }
3123
1985 } 3124 1
1986} 3125}
1987 3126
1988# the inner_* stuff is for generating a padding for the slider handle, 3127sub invoke_mouse_wheel {
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_; 3128 my ($self, $ev) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels 3129
3130 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3131
3132 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3133
3134 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
3135
3136 1
3137}
3138
3139sub update {
3140 my ($self) = @_;
3141
3142 delete $self->{knob_w};
3143 $self->SUPER::update;
1994} 3144}
1995 3145
1996sub _draw { 3146sub _draw {
1997 my ($self) = @_; 3147 my ($self) = @_;
1998 3148
3149 unless ($self->{knob_w}) {
3150 $self->set_value ($self->{range}[0]);
3151
3152 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
3153 my $range = ($hi - $page - $lo) || 1e-10;
3154
3155 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
3156
3157 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
3158 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
3159
3160 $value = ($value - $lo) / $range;
3161 $value = $value * $self->{scale} + $self->{offset};
3162
3163 $self->{knob_x} = $value - $knob_w * 0.5;
3164 $self->{knob_w} = $knob_w;
3165 }
3166
1999 $self->SUPER::_draw (); 3167 $self->SUPER::_draw ();
2000 3168
2001 my ($w, $h) = @$self{qw(w h)}; 3169 glScale $self->{w}, $self->{h};
2002 3170
2003 if ($self->{vertical}) { 3171 if ($self->{vertical}) {
2004 # draw a vertical slider like a rotated horizontal slider 3172 # draw a vertical slider like a rotated horizontal slider
2005 3173
3174 glTranslate 1, 0, 0;
2006 glRotate 90, 0, 0, 1; 3175 glRotate 90, 0, 0, 1;
2007 glTranslate 0, -$self->{w}, 0;
2008
2009 ($w, $h) = ($h, $w);
2010 } 3176 }
2011 3177
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 3178 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 3179 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014 3180
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 3181 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3182 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 3183
2038 # draw background 3184 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 3185 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2040 3186
2041 # draw handle 3187 # draw handle
2042 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 3188 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2043 3189
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 3190 glDisable GL_TEXTURE_2D;
2046} 3191}
2047 3192
2048############################################################################# 3193#############################################################################
2049 3194
2050package CFClient::UI::TextView; 3195package DC::UI::ValSlider;
2051 3196
2052our @ISA = CFClient::UI::HBox::; 3197our @ISA = DC::UI::HBox::;
2053 3198
3199sub new {
3200 my ($class, %arg) = @_;
3201
3202 my $range = delete $arg{range};
3203
3204 my $self = $class->SUPER::new (
3205 slider => (new DC::UI::Slider expand => 1, range => $range),
3206 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3207 to_value => sub { shift },
3208 from_value => sub { shift },
3209 %arg,
3210 );
3211
3212 $self->{slider}->connect (changed => sub {
3213 my ($self, $value) = @_;
3214 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
3215 $self->{parent}->emit (changed => $value);
3216 });
3217
3218# $self->{entry}->connect (changed => sub {
3219# my ($self, $value) = @_;
3220# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
3221# $self->{parent}->emit (changed => $value);
3222# });
3223
3224 $self->add ($self->{slider}, $self->{entry});
3225
3226 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
3227
3228 $self
3229}
3230
3231sub set_range { shift->{slider}->set_range (@_) }
3232sub set_value { shift->{slider}->set_value (@_) }
3233
3234#############################################################################
3235
3236package DC::UI::TextScroller;
3237
3238our @ISA = DC::UI::HBox::;
3239
2054use CFClient::OpenGL; 3240use DC::OpenGL;
2055 3241
2056sub new { 3242sub new {
2057 my $class = shift; 3243 my $class = shift;
2058 3244
2059 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
2060 fontsize => 1, 3246 fontsize => 1,
2061 can_events => 0, 3247 can_events => 1,
3248 indent => 0,
2062 #font => default_font 3249 #font => default_font
2063 @_, 3250 @_,
2064 3251
2065 layout => (new CFClient::Layout), 3252 layout => (new DC::Layout),
2066 par => [], 3253 par => [],
3254 max_par => 0,
2067 height => 0, 3255 height => 0,
2068 children => [ 3256 children => [
2069 (new CFClient::UI::Empty expand => 1), 3257 (new DC::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 3258 (new DC::UI::Slider vertical => 1),
2071 ], 3259 ],
2072 ); 3260 );
2073 3261
2074 $self->{children}[1]->connect (changed => sub { 3262 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 3263
2078 $self 3264 $self
2079} 3265}
2080 3266
2081sub set_fontsize { 3267sub set_fontsize {
… …
2083 3269
2084 $self->{fontsize} = $fontsize; 3270 $self->{fontsize} = $fontsize;
2085 $self->reflow; 3271 $self->reflow;
2086} 3272}
2087 3273
2088sub text_height { 3274sub size_request {
3275 my ($self) = @_;
3276
3277 my ($empty, $slider) = $self->visible_children;
3278
3279 local $self->{children} = [$empty, $slider];
3280 $self->SUPER::size_request
3281}
3282
3283sub invoke_size_allocate {
3284 my ($self, $w, $h) = @_;
3285
3286 my ($empty, $slider, @other) = @{ $self->{children} };
3287 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3288
3289 $self->{layout}->set_font ($self->{font}) if $self->{font};
3290 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
3291 $self->{layout}->set_width ($empty->{w});
3292 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3293
3294 $self->reflow;
3295
3296 local $self->{children} = [$empty, $slider];
3297 $self->SUPER::invoke_size_allocate ($w, $h)
3298}
3299
3300sub invoke_mouse_wheel {
2089 my ($self, $text) = @_; 3301 my ($self, $ev) = @_;
3302
3303 return 0 unless $ev->{dy}; # only vertical movements
3304
3305 $self->{children}[1]->emit (mouse_wheel => $ev);
3306
3307 1
3308}
3309
3310sub get_layout {
3311 my ($self, $para) = @_;
2090 3312
2091 my $layout = $self->{layout}; 3313 my $layout = $self->{layout};
2092 3314
3315 $layout->set_font ($self->{font}) if $self->{font};
3316 $layout->set_foreground (@{$para->{fg}});
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3317 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w}); 3318 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2095 $layout->set_text ($text); 3319 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3320 $layout->set_markup ($para->{markup});
3321
3322 $layout->set_shapes (
3323 map
3324 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3325 @{$para->{widget}}
2096 3326 );
2097 ($layout->size)[1] 3327
3328 $layout
2098} 3329}
2099 3330
2100sub reflow { 3331sub reflow {
2101 my ($self) = @_; 3332 my ($self) = @_;
2102 3333
2103 $self->{need_reflow}++; 3334 $self->{need_reflow}++;
2104 $self->update; 3335 $self->update;
2105} 3336}
2106 3337
2107sub size_allocate { 3338sub set_offset {
3339 my ($self, $offset) = @_;
3340
3341 # todo: base offset on lines or so, not on pixels
3342 $self->{children}[1]->set_value ($offset);
3343}
3344
3345sub current_paragraph {
3346 my ($self) = @_;
3347
3348 $self->{top_paragraph} - 1
3349}
3350
3351sub scroll_to {
2108 my ($self, $w, $h) = @_; 3352 my ($self, $para) = @_;
2109 3353
2110 $self->SUPER::size_allocate ($w, $h); 3354 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2111 3355
2112 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3356 $self->{scroll_to} = $para;
2113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3357 $self->update;
2114 $self->{layout}->set_width ($self->{children}[0]{w}); 3358}
2115 3359
2116 $self->reflow; 3360sub clear {
3361 my ($self) = @_;
3362
3363 my (undef, undef, @other) = @{ $self->{children} };
3364 $self->remove ($_) for @other;
3365
3366 $self->{par} = [];
3367 $self->{height} = 0;
3368 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2117} 3369}
2118 3370
2119sub add_paragraph { 3371sub add_paragraph {
2120 my ($self, $color, $text) = @_; 3372 my $self = shift;
2121 3373
2122 #TODO: intelligently "reformat" paragraph 3374 for my $para (@_) {
3375 $para = {
3376 fg => [1, 1, 1, 1],
3377 indent => 0,
3378 markup => "",
3379 widget => [],
3380 ref $para ? %$para : (markup => $para),
3381 w => 1e10,
3382 wrapped => 1,
3383 };
2123 3384
2124 my $height = $self->text_height ($text); 3385 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3386 push @{$self->{par}}, $para;
3387 }
2125 3388
3389 if (my $max = $self->{max_par}) {
3390 shift @{$self->{par}} while @{$self->{par}} > $max;
3391 }
3392
3393 $self->{need_reflow}++;
3394 $self->update;
3395}
3396
3397sub scroll_to_bottom {
3398 my ($self) = @_;
3399
3400 $self->{scroll_to} = $#{$self->{par}};
3401 $self->update;
3402}
3403
3404sub force_uptodate {
3405 my ($self) = @_;
3406
3407 if (delete $self->{need_reflow}) {
3408 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3409
3410 my $height = 0;
3411
3412 for my $para (@{$self->{par}}) {
3413 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3414 my $layout = $self->get_layout ($para);
3415 my ($w, $h) = $layout->size;
3416
3417 $para->{w} = $w + $para->{indent};
3418 $para->{h} = $h;
3419 $para->{wrapped} = $layout->has_wrapped;
3420 }
3421
3422 $para->{y} = $height;
3423 $height += $para->{h};
3424 }
3425
2126 $self->{height} += $height; 3426 $self->{height} = $height;
3427 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2127 3428
2128 push @{$self->{par}}, [$height, $color, $text]; 3429 delete $self->{texture};
3430 }
2129 3431
2130 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3432 if (my $paridx = delete $self->{scroll_to}) {
2131 $self->{children}[1]->update; 3433 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3434 }
2132} 3435}
2133 3436
2134sub update { 3437sub update {
2135 my ($self) = @_; 3438 my ($self) = @_;
2136 3439
… …
2138 3441
2139 return unless $self->{h} > 0; 3442 return unless $self->{h} > 0;
2140 3443
2141 delete $self->{texture}; 3444 delete $self->{texture};
2142 3445
2143 $ROOT->on_refresh ($self, sub { 3446 $ROOT->on_post_alloc ($self => sub {
2144 if (delete $self->{need_reflow}) { 3447 $self->force_uptodate;
2145 my $height = 0;
2146 3448
2147 $height += $_->[0] = $self->text_height ($_->[2]) 3449 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2148 for @{$self->{par}};
2149 3450
2150 $self->{height} = $height;
2151
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2153
2154 delete $self->{texture};
2155 }
2156
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 3451 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2158 glClearColor 0, 0, 0, 1; 3452 glClearColor 0, 0, 0, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 3453 glClear GL_COLOR_BUFFER_BIT;
2160 3454
2161 glEnable GL_BLEND; 3455 package DC::UI::Base;
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 3456 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2163 glEnable GL_TEXTURE_2D; 3457 (0, 0, $self->{w}, $self->{h});
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165 3458
2166 my $top = int $self->{children}[1]{range}[0]; 3459 my $top = int $self->{children}[1]{range}[0];
2167 3460
3461 my $paridx = 0;
3462 my $top_paragraph;
3463 my $top = int $self->{children}[1]{range}[0];
3464
2168 my $y0 = $top; 3465 my $y0 = $top;
2169 my $y1 = $top + $self->{h}; 3466 my $y1 = $top + $H;
2170 3467
2171 my $y = 0;
2172
2173 my $layout = $self->{layout};
2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176
2177 for my $par (@{$self->{par}}) { 3468 for my $para (@{$self->{par}}) {
2178 my $h = $par->[0]; 3469 my $h = $para->{h};
3470 my $y = $para->{y};
2179 3471
2180 if ($y0 < $y + $h && $y < $y1) { 3472 if ($y0 < $y + $h && $y < $y1) {
2181 $layout->set_text ($par->[2]); 3473 my $layout = $self->get_layout ($para);
2182 3474
2183 glColor @{ $par->[1] }; 3475 $layout->render ($para->{indent}, $y - $y0);
2184 my ($W, $H) = $layout->size; 3476 $layout->draw;
2185 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 3477
3478 if (my @w = @{ $para->{widget} }) {
3479 my @s = $layout->get_shapes;
3480
3481 for (@w) {
3482 my ($dx, $dy) = splice @s, 0, 2, ();
3483
3484 $_->{x} = $dx + $para->{indent};
3485 $_->{y} = $dy + $y - $y0;
3486
3487 $_->draw;
3488 }
3489 }
2186 } 3490 }
2187 3491
2188 $y += $h; 3492 $paridx++;
3493 $top_paragraph ||= $paridx if $y >= $top;
2189 } 3494 }
2190 3495
2191 glDisable GL_TEXTURE_2D; 3496 $self->{top_paragraph} = $top_paragraph;
2192 glDisable GL_BLEND;
2193 }; 3497 };
2194 }); 3498 });
2195} 3499}
2196 3500
3501sub reconfigure {
3502 my ($self) = @_;
3503
3504 $self->SUPER::reconfigure;
3505
3506 $_->{w} = 1e10 for @{ $self->{par} };
3507 $self->reflow;
3508}
3509
2197sub _draw { 3510sub _draw {
2198 my ($self) = @_; 3511 my ($self) = @_;
2199 3512
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 3513 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 3515 glColor 0, 0, 0, 1;
2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 3516 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2205 glDisable GL_TEXTURE_2D; 3517 glDisable GL_TEXTURE_2D;
2206 }
2207 3518
2208 $self->{children}[1]->draw; 3519 $self->{children}[1]->draw;
2209
2210} 3520}
2211 3521
2212############################################################################# 3522#############################################################################
2213 3523
2214package CFClient::UI::Animator; 3524package DC::UI::Animator;
2215 3525
2216use CFClient::OpenGL; 3526use DC::OpenGL;
2217 3527
2218our @ISA = CFClient::UI::Bin::; 3528our @ISA = DC::UI::Bin::;
2219 3529
2220sub moveto { 3530sub moveto {
2221 my ($self, $x, $y) = @_; 3531 my ($self, $x, $y) = @_;
2222 3532
2223 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3533 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2251 glPopMatrix; 3561 glPopMatrix;
2252} 3562}
2253 3563
2254############################################################################# 3564#############################################################################
2255 3565
2256package CFClient::UI::Flopper; 3566package DC::UI::Flopper;
2257 3567
2258our @ISA = CFClient::UI::Button::; 3568our @ISA = DC::UI::Button::;
2259 3569
2260sub new { 3570sub new {
2261 my $class = shift; 3571 my $class = shift;
2262 3572
2263 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
2264 state => 0, 3574 state => 0,
2265 connect_activate => \&toggle_flopper, 3575 on_activate => \&toggle_flopper,
2266 @_ 3576 @_
2267 ); 3577 );
2268 3578
2269 if ($self->{state}) {
2270 $self->{state} = 0;
2271 $self->toggle_flopper;
2272 }
2273
2274 $self 3579 $self
2275} 3580}
2276 3581
2277sub toggle_flopper { 3582sub toggle_flopper {
2278 my ($self) = @_; 3583 my ($self) = @_;
2279 3584
2280 # TODO: use animation 3585 $self->{other}->toggle_visibility;
2281 if ($self->{state} = !$self->{state}) {
2282 $CFClient::UI::ROOT->add ($self->{other});
2283 $self->{other}->move ($self->coord2global (0, $self->{h}));
2284 $self->emit ("open");
2285 } else {
2286 $CFClient::UI::ROOT->remove ($self->{other});
2287 $self->emit ("close");
2288 }
2289
2290 $self->emit (changed => $self->{state});
2291} 3586}
2292 3587
2293############################################################################# 3588#############################################################################
2294 3589
2295package CFClient::UI::Tooltip; 3590package DC::UI::Tooltip;
2296 3591
2297our @ISA = CFClient::UI::Bin::; 3592our @ISA = DC::UI::Bin::;
2298 3593
2299use CFClient::OpenGL; 3594use DC::OpenGL;
2300 3595
2301sub new { 3596sub new {
2302 my $class = shift; 3597 my $class = shift;
2303 3598
2304 $class->SUPER::new ( 3599 $class->SUPER::new (
2305 @_, 3600 @_,
2306 can_events => 0, 3601 can_events => 0,
2307 ) 3602 )
2308} 3603}
2309 3604
2310sub set_markup { 3605sub set_tooltip_from {
2311 my ($self, $text) = @_; 3606 my ($self, $widget) = @_;
2312 3607
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 3608 my $tip = $widget->{tooltip};
2314 $self->{label}->set_markup ($text); 3609 $tip = $tip->($widget) if "CODE" eq ref $tip;
2315 $self->add ($self->{label}); 3610
3611 $tip = DC::Pod::section_label tooltip => $1
3612 if $tip =~ /^#(.*)$/;
3613
3614 if ($ENV{CFPLUS_DEBUG} & 2) {
3615 $tip .= "\n\n" . (ref $widget) . "\n"
3616 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3617 . "req $widget->{req_w} $widget->{req_h}\n"
3618 . "visible $widget->{visible}";
3619 }
3620
3621 $tip =~ s/^\n+//;
3622 $tip =~ s/\n+$//;
3623
3624 $self->add (new DC::UI::Label
3625 markup => $tip,
3626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3627 align => 0,
3628 fontsize => 0.8,
3629 style => 1, # FLAG_INVERSE
3630 ellipsise => 0,
3631 font => ($widget->{tooltip_font} || $::FONT_PROP),
3632 );
2316} 3633}
2317 3634
2318sub size_request { 3635sub size_request {
2319 my ($self) = @_; 3636 my ($self) = @_;
2320 3637
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3638 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 3639
2325 ($w + 4, $h + 4) 3640 ($w + 4, $h + 4)
2326} 3641}
2327 3642
2328sub size_allocate { 3643sub invoke_size_allocate {
2329 my ($self, $w, $h) = @_; 3644 my ($self, $w, $h) = @_;
2330 3645
2331 $self->SUPER::size_allocate ($w - 4, $h - 4); 3646 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3647}
3648
3649sub invoke_visibility_change {
3650 my ($self, $visible) = @_;
3651
3652 return unless $visible;
3653
3654 $self->{root}->on_post_alloc ("move_$self" => sub {
3655 my $widget = $self->{owner}
3656 or return;
3657
3658 if ($widget->{visible}) {
3659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3660
3661 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3662 if $x + $self->{w} > $self->{root}{w};
3663
3664 $self->move_abs ($x, $y);
3665 } else {
3666 $self->hide;
3667 }
3668 });
2332} 3669}
2333 3670
2334sub _draw { 3671sub _draw {
2335 my ($self) = @_; 3672 my ($self) = @_;
2336 3673
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375;
2339
2340 my ($w, $h) = @$self{qw(w h)}; 3674 my ($w, $h) = @$self{qw(w h)};
2341 3675
2342 glColor 1, 0.8, 0.4; 3676 glColor 1, 0.8, 0.4;
2343 glBegin GL_QUADS; 3677 glRect 0, 0, $w, $h;
2344 glVertex 0 , 0;
2345 glVertex 0 , $h;
2346 glVertex $w, $h;
2347 glVertex $w, 0;
2348 glEnd;
2349 3678
2350 glColor 0, 0, 0; 3679 glColor 0, 0, 0;
2351 glBegin GL_LINE_LOOP; 3680 glRect_lineloop .5, .5, $w + .5, $h + .5;
2352 glVertex 0 , 0;
2353 glVertex 0 , $h;
2354 glVertex $w, $h;
2355 glVertex $w, 0;
2356 glEnd;
2357 3681
2358 glPopMatrix;
2359
2360 glTranslate 2, 2; 3682 glTranslate 2, 2;
3683
2361 $self->SUPER::_draw; 3684 $self->SUPER::_draw;
2362} 3685}
2363 3686
2364############################################################################# 3687#############################################################################
2365 3688
2366package CFClient::UI::Face; 3689package DC::UI::Face;
2367 3690
2368our @ISA = CFClient::UI::Base::; 3691our @ISA = DC::UI::DrawBG::;
2369 3692
2370use CFClient::OpenGL; 3693use DC::OpenGL;
2371 3694
2372sub new { 3695sub new {
2373 my $class = shift; 3696 my $class = shift;
2374 3697
2375 $class->SUPER::new ( 3698 my $self = $class->SUPER::new (
3699 size_w => 32,
3700 size_h => 8,
2376 aspect => 1, 3701 aspect => 1,
3702 can_events => 0,
2377 @_, 3703 @_,
2378 ) 3704 );
3705
3706 if ($self->{anim} && $self->{animspeed}) {
3707 DC::weaken (my $widget = $self);
3708
3709 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3710 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3711 return unless $::CONN;
3712
3713 my $w = $widget
3714 or return;
3715
3716 ++$w->{frame};
3717 $w->update_face;
3718
3719 # somehow, $widget can go away
3720 $w->update;
3721 $w->update_timer;
3722 };
3723
3724 $self->update_face;
3725 $self->update_timer;
3726 }
3727
3728 $self
3729}
3730
3731sub update_timer {
3732 my ($self) = @_;
3733
3734 return unless $self->{timer};
3735
3736 if ($self->{visible}) {
3737 $self->{timer}->start;
3738 } else {
3739 $self->{timer}->stop;
3740 }
3741}
3742
3743sub update_face {
3744 my ($self) = @_;
3745
3746 if ($::CONN) {
3747 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3748 if ($anim && @$anim) {
3749 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3750 delete $self->{face_change_cb};
3751
3752 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3753 unless ($tex->{name} || $tex->{loading}) {
3754 $tex->upload (sub { $self->reconfigure });
3755 }
3756 }
3757 }
3758 }
3759 }
2379} 3760}
2380 3761
2381sub size_request { 3762sub size_request {
2382 (32, 8) 3763 my ($self) = @_;
2383}
2384 3764
3765 if ($::CONN) {
3766 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3767 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3768 if ($tex->{name}) {
3769 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3770 } elsif (!$tex->{loading}) {
3771 $tex->upload (sub { $self->reconfigure });
3772 }
3773 }
3774
3775 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3776 }
3777 }
3778
3779 ($self->{size_w} || 8, $self->{size_h} || 8)
3780}
3781
3782sub update {
3783 my ($self) = @_;
3784
3785 return unless $self->{visible};
3786
3787 $self->SUPER::update;
3788}
3789
3790sub invoke_visibility_change {
3791 my ($self) = @_;
3792
3793 $self->update_timer;
3794
3795 0
3796}
3797
2385sub draw { 3798sub _draw {
2386 my ($self) = @_; 3799 my ($self) = @_;
2387 3800
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3801 $self->SUPER::_draw;
2389 3802
2390 if ($tex) { 3803 if (my $tex = $self->{tex}) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 3804 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3805 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 3806 glColor 0, 0, 0, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 3807 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 3808 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 } 3809 }
3810}
3811
3812sub destroy {
3813 my ($self) = @_;
3814
3815 (delete $self->{timer})->cancel
3816 if $self->{timer};
3817
3818 $self->SUPER::destroy;
2400} 3819}
2401 3820
2402############################################################################# 3821#############################################################################
2403 3822
2404package CFClient::UI::Root; 3823package DC::UI::Buttonbar;
2405 3824
2406our @ISA = CFClient::UI::Container::; 3825our @ISA = DC::UI::HBox::;
2407 3826
3827# TODO: should actually wrap buttons and other goodies.
3828
3829#############################################################################
3830
3831package DC::UI::Menu;
3832
3833our @ISA = DC::UI::Toplevel::;
3834
2408use CFClient::OpenGL; 3835use DC::OpenGL;
2409 3836
2410sub check_size { 3837sub new {
3838 my $class = shift;
3839
3840 my $self = $class->SUPER::new (
3841 items => [],
3842 z => 100,
3843 @_,
3844 );
3845
3846 $self->add ($self->{vbox} = new DC::UI::VBox);
3847
3848 for my $item (@{ $self->{items} }) {
3849 my ($widget, $cb, $tooltip) = @$item;
3850
3851 # handle various types of items, only text for now
3852 if (!ref $widget) {
3853 if ($widget =~ /\t/) {
3854 my ($left, $right) = split /\t/, $widget, 2;
3855
3856 $widget = new DC::UI::HBox
3857 can_hover => 1,
3858 can_events => 1,
3859 tooltip => $tooltip,
3860 children => [
3861 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3862 (new DC::UI::Label markup => $right, align => 1),
3863 ],
3864 ;
3865
3866 } else {
3867 $widget = new DC::UI::Label
3868 can_hover => 1,
3869 can_events => 1,
3870 align => 0,
3871 markup => $widget,
3872 tooltip => $tooltip;
3873 }
3874 }
3875
3876 $self->{item}{$widget} = $item;
3877
3878 $self->{vbox}->add ($widget);
3879 }
3880
3881 $self
3882}
3883
3884# popup given the event (must be a mouse button down event currently)
3885sub popup {
2411 my ($self) = @_; 3886 my ($self, $ev) = @_;
2412 3887
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3888 $self->emit ("popdown");
3889
3890 # maybe save $GRAB? must be careful about events...
3891 $GRAB = $self;
3892 $self->{button} = $ev->{button};
3893
3894 $self->show;
3895 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3896}
3897
3898sub invoke_mouse_motion {
3899 my ($self, $ev, $x, $y) = @_;
3900
3901 # TODO: should use vbox->find_widget or so
3902 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3903 $self->{hover} = $self->{item}{$HOVER};
3904
3905 0
3906}
3907
3908sub invoke_button_up {
3909 my ($self, $ev, $x, $y) = @_;
3910
3911 if ($ev->{button} == $self->{button}) {
3912 undef $GRAB;
3913 $self->hide;
3914
3915 $self->emit ("popdown");
3916 $self->{hover}[1]->() if $self->{hover};
3917 } else {
3918 return 0
3919 }
3920
3921 1
3922}
3923
3924#############################################################################
3925
3926package DC::UI::Multiplexer;
3927
3928our @ISA = DC::UI::Container::;
3929
3930sub new {
3931 my $class = shift;
3932
3933 my $self = $class->SUPER::new (
3934 @_,
3935 );
3936
3937 $self->{current} = $self->{children}[0]
3938 if @{ $self->{children} };
3939
3940 $self
3941}
3942
3943sub add {
3944 my ($self, @widgets) = @_;
3945
3946 $self->SUPER::add (@widgets);
3947
3948 $self->{current} = $self->{children}[0]
3949 if @{ $self->{children} };
3950}
3951
3952sub get_current_page {
3953 my ($self) = @_;
3954
3955 $self->{current}
3956}
3957
3958sub set_current_page {
3959 my ($self, $page_or_widget) = @_;
3960
3961 my $widget = ref $page_or_widget
3962 ? $page_or_widget
3963 : $self->{children}[$page_or_widget];
3964
3965 $self->{current} = $widget;
3966 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3967
3968 $self->emit (page_changed => $self->{current});
3969
3970 $self->realloc;
3971}
3972
3973sub visible_children {
3974 $_[0]{current}
2414} 3975}
2415 3976
2416sub size_request { 3977sub size_request {
2417 ($::WIDTH, $::HEIGHT) 3978 my ($self) = @_;
2418}
2419 3979
3980 $self->{current}->size_request
3981}
3982
3983sub invoke_size_allocate {
3984 my ($self, $w, $h) = @_;
3985
3986 $self->{current}->configure (0, 0, $w, $h);
3987
3988 1
3989}
3990
3991sub _draw {
3992 my ($self) = @_;
3993
3994 $self->{current}->draw;
3995}
3996
3997#############################################################################
3998
3999package DC::UI::Notebook;
4000
4001use DC::OpenGL;
4002
4003our @ISA = DC::UI::VBox::;
4004
4005sub new {
4006 my $class = shift;
4007
4008 my $self = $class->SUPER::new (
4009 buttonbar => (new DC::UI::Buttonbar),
4010 multiplexer => (new DC::UI::Multiplexer expand => 1),
4011 active_outline => [.7, .7, 0.2],
4012 # filter => # will be put between multiplexer and $self
4013 @_,
4014 );
4015
4016 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
4017 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
4018
4019 {
4020 Scalar::Util::weaken (my $wself = $self);
4021
4022 $self->{multiplexer}->connect (c_add => sub {
4023 my ($mplex, $widgets) = @_;
4024
4025 for my $child (@$widgets) {
4026 Scalar::Util::weaken $child;
4027 $child->{c_tab_} ||= do {
4028 my $tab =
4029 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4030 ? $child->{c_tab}
4031 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4032
4033 $tab->connect (activate => sub {
4034 $wself->set_current_page ($child);
4035 });
4036
4037 $tab
4038 };
4039
4040 $self->{buttonbar}->add ($child->{c_tab_});
4041 }
4042 });
4043
4044 $self->{multiplexer}->connect (c_remove => sub {
4045 my ($mplex, $widgets) = @_;
4046
4047 for my $child (@$widgets) {
4048 $wself->{buttonbar}->remove ($child->{c_tab_});
4049 }
4050 });
4051 }
4052
4053 $self
4054}
4055
4056sub add {
4057 my ($self, @widgets) = @_;
4058
4059 $self->{multiplexer}->add (@widgets)
4060}
4061
4062sub remove {
4063 my ($self, @widgets) = @_;
4064
4065 $self->{multiplexer}->remove (@widgets)
4066}
4067
4068sub pages {
4069 my ($self) = @_;
4070 $self->{multiplexer}->children
4071}
4072
4073sub page_index {
4074 my ($self, $widget) = @_;
4075
4076 my $i = 0;
4077 for ($self->pages) {
4078 if ($_ eq $widget) { return $i };
4079 $i++;
4080 }
4081
4082 undef
4083}
4084
4085sub add_tab {
4086 my ($self, $title, $widget, $tooltip) = @_;
4087
4088 $title = [$title, $tooltip] unless ref $title;
4089 $widget->{c_tab} = $title;
4090
4091 $self->add ($widget);
4092}
4093
4094sub get_current_page {
4095 my ($self) = @_;
4096
4097 $self->{multiplexer}->get_current_page
4098}
4099
4100sub set_current_page {
4101 my ($self, $page) = @_;
4102
4103 $self->{multiplexer}->set_current_page ($page);
4104 $self->emit (page_changed => $self->{multiplexer}{current});
4105}
4106
4107sub _draw {
4108 my ($self) = @_;
4109
4110 $self->SUPER::_draw ();
4111
4112 if (my $cur = $self->{multiplexer}{current}) {
4113 if ($cur = $cur->{c_tab_}) {
4114 glTranslate $self->{buttonbar}{x} + $cur->{x},
4115 $self->{buttonbar}{y} + $cur->{y};
4116 glLineWidth 3;
4117 #glEnable GL_BLEND;
4118 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4119 glColor @{$self->{active_outline}};
4120 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4121 glLineWidth 1;
4122 #glDisable GL_BLEND;
4123 }
4124 }
4125}
4126
4127#############################################################################
4128
4129package DC::UI::Selector;
4130
4131use utf8;
4132
4133our @ISA = DC::UI::Button::;
4134
4135sub new {
4136 my $class = shift;
4137
4138 my $self = $class->SUPER::new (
4139 options => [], # [value, title, longdesc], ...
4140 value => undef,
4141 @_,
4142 );
4143
4144 $self->_set_value ($self->{value});
4145
4146 $self
4147}
4148
4149sub invoke_button_down {
4150 my ($self, $ev) = @_;
4151
4152 my @menu_items;
4153
4154 for (@{ $self->{options} }) {
4155 my ($value, $title, $tooltip) = @$_;
4156
4157 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4158 }
4159
4160 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
4161}
4162
4163sub _set_value {
4164 my ($self, $value) = @_;
4165
4166 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4167 $item ||= $self->{options}[0]
4168 or return;
4169
4170 $self->{value} = $item->[0];
4171 $self->set_markup ("$item->[1] ⇓");
4172# $self->set_tooltip ($item->[2]);
4173}
4174
4175sub set_value {
4176 my ($self, $value) = @_;
4177
4178 return unless $self->{value} ne $value;
4179
4180 $self->_set_value ($value);
4181 $self->emit (changed => $value);
4182}
4183
4184sub set_options {
4185 my ($self, $options) = @_;
4186
4187 $self->{options} = $options;
4188 $self->_set_value ($self->{value});
4189}
4190
4191#############################################################################
4192
4193package DC::UI::Statusbox;
4194
4195our @ISA = DC::UI::VBox::;
4196
4197sub new {
4198 my $class = shift;
4199
4200 my $self = $class->SUPER::new (
4201 fontsize => 0.8,
4202 @_,
4203 );
4204
4205 DC::weaken (my $this = $self);
4206
4207 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4208
4209 $self
4210}
4211
4212sub reorder {
4213 my ($self) = @_;
4214 my $NOW = Time::HiRes::time;
4215
4216 # freeze display when hovering over any label
4217 return if $DC::UI::TOOLTIP->{owner}
4218 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4219 values %{ $self->{item} };
4220
4221 while (my ($k, $v) = each %{ $self->{item} }) {
4222 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4223 }
4224
4225 $self->{timer}->set (1, 1);
4226
4227 my @widgets;
4228
4229 my @items = sort {
4230 $a->{pri} <=> $b->{pri}
4231 or $b->{id} <=> $a->{id}
4232 } values %{ $self->{item} };
4233
4234 my $count = 10 + 1;
4235 for my $item (@items) {
4236 last unless --$count;
4237
4238 my $label = $item->{label} ||= do {
4239 # TODO: doesn't handle markup well (read as: at all)
4240 my $short = $item->{count} > 1
4241 ? "<b>$item->{count} ×</b> $item->{text}"
4242 : $item->{text};
4243
4244 for ($short) {
4245 s/^\s+//;
4246 s/\s+/ /g;
4247 }
4248
4249 new DC::UI::Label
4250 markup => $short,
4251 tooltip => $item->{tooltip},
4252 tooltip_font => $::FONT_PROP,
4253 tooltip_width => 0.67,
4254 fontsize => $item->{fontsize} || $self->{fontsize},
4255 max_w => $::WIDTH * 0.44,
4256 align => 0,
4257 fg => [@{ $item->{fg} }],
4258 can_events => 1,
4259 can_hover => 1
4260 };
4261
4262 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4263 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4264 $label->update;
4265 $label->set_max_size (undef, $label->{req_h} * $diff)
4266 if $diff < 1;
4267 $self->{timer}->set (1/30, 1/30);
4268 } else {
4269 $label->{fg}[3] = $item->{fg}[3] || 1;
4270 }
4271
4272 push @widgets, $label;
4273 }
4274
4275 $self->clear;
4276 $self->SUPER::add (reverse @widgets);
4277}
4278
4279sub add {
4280 my ($self, $text, %arg) = @_;
4281
4282 $text =~ s/^\s+//;
4283 $text =~ s/\s+$//;
4284
4285 return unless $text;
4286
4287 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
4288
4289 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
4290
4291 if (my $item = $self->{item}{$group}) {
4292 if ($item->{text} eq $text) {
4293 $item->{count}++;
4294 } else {
4295 $item->{count} = 1;
4296 $item->{text} = $item->{tooltip} = $text;
4297 }
4298 $item->{id} += 0.2;#d#
4299 $item->{timeout} = $timeout;
4300 delete $item->{label};
4301 } else {
4302 $self->{item}{$group} = {
4303 id => ++$self->{id},
4304 text => $text,
4305 timeout => $timeout,
4306 tooltip => $text,
4307 fg => [0.8, 0.8, 0.8, 0.8],
4308 pri => 0,
4309 count => 1,
4310 %arg,
4311 };
4312 }
4313
4314 $ROOT->on_refresh (reorder => sub {
4315 $self->reorder;
4316 });
4317}
4318
2420sub configure { 4319sub reconfigure {
4320 my ($self) = @_;
4321
4322 delete $_->{label}
4323 for values %{ $self->{item} || {} };
4324
4325 $self->reorder;
4326 $self->SUPER::reconfigure;
4327}
4328
4329sub destroy {
4330 my ($self) = @_;
4331
4332 $self->{timer}->cancel;
4333
4334 $self->SUPER::destroy;
4335}
4336
4337#############################################################################
4338
4339package DC::UI::Root;
4340
4341our @ISA = DC::UI::Container::;
4342
4343use List::Util qw(min max);
4344
4345use DC::OpenGL;
4346
4347sub new {
4348 my $class = shift;
4349
4350 my $self = $class->SUPER::new (
4351 visible => 1,
4352 @_,
4353 );
4354
4355 DC::weaken ($self->{root} = $self);
4356
4357 $self
4358}
4359
4360sub size_request {
4361 my ($self) = @_;
4362
4363 ($self->{w}, $self->{h})
4364}
4365
4366sub _to_pixel {
4367 my ($coord, $size, $max) = @_;
4368
4369 $coord =
4370 $coord eq "center" ? ($max - $size) * 0.5
4371 : $coord eq "max" ? $max
4372 : $coord;
4373
4374 $coord = 0 if $coord < 0;
4375 $coord = $max - $size if $coord > $max - $size;
4376
4377 int $coord + 0.5
4378}
4379
4380sub invoke_size_allocate {
2421 my ($self, $x, $y, $w, $h) = @_; 4381 my ($self, $w, $h) = @_;
2422 4382
2423 $self->SUPER::configure ($x, $y, $w, $h);
2424
2425 for my $child (@{$self->{children}}) { 4383 for my $child ($self->children) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4384 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427 4385
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X; 4386 $X = $child->{force_x} if exists $child->{force_x};
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 4387 $Y = $child->{force_y} if exists $child->{force_y};
4388
4389 $X = _to_pixel $X, $W, $self->{w};
4390 $Y = _to_pixel $Y, $H, $self->{h};
4391
2430 $child->configure ($X, $Y, $W,$H); 4392 $child->configure ($X, $Y, $W, $H);
4393 }
4394
2431 } 4395 1
2432} 4396}
2433 4397
2434sub _topleft { 4398sub coord2local {
2435 my ($self, $x, $y) = @_; 4399 my ($self, $x, $y) = @_;
2436 4400
2437 ($x, $y) 4401 ($x, $y)
2438} 4402}
2439 4403
4404sub coord2global {
4405 my ($self, $x, $y) = @_;
4406
4407 ($x, $y)
4408}
4409
2440sub update { 4410sub update {
2441 my ($self) = @_; 4411 my ($self) = @_;
2442 4412
2443 $self->check_size; 4413 $::WANT_REFRESH = 1;
2444 ::refresh ();
2445} 4414}
2446 4415
2447sub add { 4416sub add {
2448 my ($self, $child) = @_; 4417 my ($self, @children) = @_;
2449 4418
2450 # integerize window positions 4419 $_->{is_toplevel} = 1
2451 $child->{x} = int $child->{x}; 4420 for @children;
2452 $child->{y} = int $child->{y};
2453 4421
2454 $self->SUPER::add ($child); 4422 $self->SUPER::add (@children);
4423}
4424
4425sub remove {
4426 my ($self, @children) = @_;
4427
4428 $self->SUPER::remove (@children);
4429
4430 delete $self->{is_toplevel}
4431 for @children;
4432
4433 while (@children) {
4434 my $w = pop @children;
4435 push @children, $w->children;
4436 $w->set_invisible;
4437 }
2455} 4438}
2456 4439
2457sub on_refresh { 4440sub on_refresh {
2458 my ($self, $id, $cb) = @_; 4441 my ($self, $id, $cb) = @_;
2459 4442
2460 $self->{refresh_hook}{$id} = $cb; 4443 $self->{refresh_hook}{$id} = $cb;
2461} 4444}
2462 4445
4446sub on_post_alloc {
4447 my ($self, $id, $cb) = @_;
4448
4449 $self->{post_alloc_hook}{$id} = $cb;
4450}
4451
2463sub draw { 4452sub draw {
2464 my ($self) = @_; 4453 my ($self) = @_;
2465 4454
2466 while (my $rcb = delete $self->{refresh_hook}) { 4455 while ($self->{refresh_hook}) {
2467 $_->() for values %$rcb; 4456 $_->()
4457 for values %{delete $self->{refresh_hook}};
4458 }
4459
4460 while ($self->{realloc}) {
4461 my %queue;
4462 my @queue;
4463 my $widget;
4464
4465 outer:
4466 while () {
4467 if (my $realloc = delete $self->{realloc}) {
4468 for $widget (values %$realloc) {
4469 $widget->{visible} or next; # do not resize invisible widgets
4470
4471 $queue{$widget+0}++ and next; # duplicates are common
4472
4473 push @{ $queue[$widget->{visible}] }, $widget;
4474 }
4475 }
4476
4477 while () {
4478 @queue or last outer;
4479
4480 $widget = pop @{ $queue[-1] || [] }
4481 and last;
4482
4483 pop @queue;
4484 }
4485
4486 delete $queue{$widget+0};
4487
4488 my ($w, $h) = $widget->size_request;
4489
4490 $w += $widget->{padding_x} * 2;
4491 $h += $widget->{padding_y} * 2;
4492
4493 $w = max $widget->{min_w}, $w;
4494 $h = max $widget->{min_h}, $h;
4495
4496 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4497 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4498
4499 $w = $widget->{force_w} if exists $widget->{force_w};
4500 $h = $widget->{force_h} if exists $widget->{force_h};
4501
4502 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4503 || delete $widget->{force_realloc}) {
4504 $widget->{req_w} = $w;
4505 $widget->{req_h} = $h;
4506
4507 $self->{size_alloc}{$widget+0} = $widget;
4508
4509 if (my $parent = $widget->{parent}) {
4510 $self->{realloc}{$parent+0} = $parent
4511 unless $queue{$parent+0};
4512
4513 $parent->{force_size_alloc} = 1;
4514 $self->{size_alloc}{$parent+0} = $parent;
4515 }
4516 }
4517
4518 delete $self->{realloc}{$widget+0};
4519 }
4520
4521 while (my $size_alloc = delete $self->{size_alloc}) {
4522 my @queue = sort { $a->{visible} <=> $b->{visible} }
4523 values %$size_alloc;
4524
4525 while () {
4526 my $widget = pop @queue || last;
4527
4528 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4529
4530 $w = max $widget->{min_w}, $w;
4531 $h = max $widget->{min_h}, $h;
4532
4533# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4534# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4535
4536 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4537 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4538
4539 $w = int $w + 0.5;
4540 $h = int $h + 0.5;
4541
4542 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4543 $widget->{old_w} = $widget->{w};
4544 $widget->{old_h} = $widget->{h};
4545
4546 $widget->{w} = $w;
4547 $widget->{h} = $h;
4548
4549 $widget->emit (size_allocate => $w, $h);
4550 }
4551 }
4552 }
4553 }
4554
4555 while ($self->{post_alloc_hook}) {
4556 $_->()
4557 for values %{delete $self->{post_alloc_hook}};
2468 } 4558 }
2469 4559
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4560 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4561 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 4562 glClear GL_COLOR_BUFFER_BIT;
2473 4563
2474 glMatrixMode GL_PROJECTION; 4564 glMatrixMode GL_PROJECTION;
2475 glLoadIdentity; 4565 glLoadIdentity;
2476 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4566 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2477 glMatrixMode GL_MODELVIEW; 4567 glMatrixMode GL_MODELVIEW;
2478 glLoadIdentity; 4568 glLoadIdentity;
2479 4569
4570 {
4571 package DC::UI::Base;
4572
4573 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4574 (0, 0, $self->{w}, $self->{h});
4575
2480 $self->_draw; 4576 $self->_draw;
4577 }
2481} 4578}
2482 4579
2483############################################################################# 4580#############################################################################
2484 4581
2485package CFClient::UI; 4582package DC::UI;
2486 4583
2487$ROOT = new CFClient::UI::Root; 4584$ROOT = new DC::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip; 4585$TOOLTIP = new DC::UI::Tooltip z => 900;
2489 4586
24901 45871
2491 4588

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines