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.78 by root, Tue Apr 11 22:49:13 2006 UTC vs.
Revision 1.174 by root, Tue Apr 25 11:18:49 2006 UTC

7 7
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $TOPLEVEL; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29
30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48}
14 49
15# class methods for events 50# class methods for events
16sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
18} 54}
19 55
20sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
22} 59}
23 60
24sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
25 my ($ev) = @_; 62 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
27 64
28 if (!$BUTTON_STATE) { 65 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y); 66 my $widget = $ROOT->find_widget ($x, $y);
30 67
31 $GRAB = $widget; 68 $GRAB = $widget;
32 $GRAB->update if $GRAB; 69 $GRAB->update if $GRAB;
33 }
34 70
71 check_tooltip;
72 }
73
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 75
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
38} 80}
39 81
40sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
41 my ($ev) = @_; 83 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
43 85
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 87
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 89
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
49 94
50 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 97 $grab->update if $grab;
53 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
99
100 check_tooltip;
54 } 101 }
55} 102}
56 103
57sub feed_sdl_motion_event { 104sub feed_sdl_motion_event {
58 my ($ev) = @_; 105 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 106 my ($x, $y) = ($ev->{x}, $ev->{y});
60 107
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 108 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 109
63 if ($widget != $HOVER) { 110 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 111 my $hover = $HOVER; $HOVER = $widget;
65 112
66 $hover->update if $hover; 113 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 115
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 116 check_tooltip;
117 }
118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
123}
124
125# convert position array to integers
126sub harmonize {
127 my ($vals) = @_;
128
129 my $rem = 0;
130
131 for (@$vals) {
132 my $i = int $_ + $rem;
133 $rem += $_ - $i;
134 $_ = $i;
135 }
71} 136}
72 137
73############################################################################# 138#############################################################################
74 139
75package CFClient::UI::Base; 140package CFClient::UI::Base;
76 141
77use strict; 142use strict;
78 143
79use SDL::OpenGL; 144use CFClient::OpenGL;
80 145
81sub new { 146sub new {
82 my $class = shift; 147 my $class = shift;
83 148
84 bless { 149 my $self = bless {
85 x => 0, 150 x => 0,
86 y => 0, 151 y => 0,
87 z => 0, 152 z => 0,
88 w => -1, 153 can_events => 1,
89 h => -1,
90 @_ 154 @_
91 }, $class 155 }, $class;
156
157 for (keys %$self) {
158 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_});
160 }
161 }
162
163 $self
164}
165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
173sub show {
174 my ($self) = @_;
175
176 return if $self->{parent};
177
178 $CFClient::UI::ROOT->add ($self);
179}
180
181sub hide {
182 my ($self) = @_;
183
184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
186
187 $self->{parent}->remove ($self)
188 if $self->{parent};
92} 189}
93 190
94sub move { 191sub move {
95 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
193
96 $self->{x} = $x; 194 $self->{x} = int $x;
97 $self->{y} = $y; 195 $self->{y} = int $y;
98 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
99}
100 197
101sub needs_redraw { 198 $self->update;
102 0 199}
200
201sub set_size {
202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
103} 208}
104 209
105sub size_request { 210sub size_request {
106 require Carp; 211 require Carp;
107 Carp::confess "size_request is abtract"; 212 Carp::confess "size_request is abstract";
108} 213}
109 214
110sub _size_allocate { 215sub configure {
111 my ($self, $x, $y, $w, $h) = @_; 216 my ($self, $x, $y, $w, $h) = @_;
112 217
218 if ($self->{aspect}) {
219 my $w2 = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect};
221
222 # use alignment to adjust x, y
223
224 $x += int +($w - $w2) * 0.5;
225 $y += int +($h - $h2) * 0.5;
226
227 ($w, $h) = ($w2, $h2);
228 }
229
230 if ($self->{x} != $x || $self->{y} != $y) {
113 $self->{x} = $x; 231 $self->{x} = $x;
114 $self->{y} = $y; 232 $self->{y} = $y;
233 $self->update;
234 }
115 235
116 return unless $self->{w} != $w || $self->{h} != $h; 236 if ($self->{w} != $w || $self->{h} != $h) {
117
118 $self->{w} = $w; 237 $self->{w} = $w;
119 $self->{h} = $h; 238 $self->{h} = $h;
120 239
240 $self->size_allocate ($w, $h);
241 $self->update;
121 1 242 }
122} 243}
123 244
124sub size_allocate { 245sub size_allocate {
246 # nothing to be done
247}
248
249sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260}
261
262sub set_max_size {
125 my ($self, $x, $y, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
126 264
127 $self->_size_allocate ($x, $y, $w, $h); 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h;
128} 267}
129 268
130# translate global koordinates to local coordinate system 269# return top left coordinates
131sub translate { 270sub _topleft {
132 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
133 272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
275
134 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
277}
278
279# translate global coordinates to local coordinate system
280sub coord2local {
281 my ($self, $x, $y) = @_;
282
283 my ($X, $Y) = $self->_topleft;
284 ($x - $X, $y - $Y)
285}
286
287# translate local coordinates to global coordinate system
288sub coord2global {
289 my ($self, $x, $y) = @_;
290
291 my ($X, $Y) = $self->_topleft;
292 ($x + $X, $y + $Y)
135} 293}
136 294
137sub focus_in { 295sub focus_in {
138 my ($self) = @_; 296 my ($self) = @_;
139 297
140 return if $FOCUS == $self; 298 return if $FOCUS == $self;
299 return unless $self->{can_focus};
141 300
142 my $focus = $FOCUS; $FOCUS = $self; 301 my $focus = $FOCUS; $FOCUS = $self;
302
303 $self->emit (focus_in => $focus);
304
143 $focus->update if $focus; 305 $focus->update if $focus;
144 $FOCUS->update; 306 $FOCUS->update;
145} 307}
146 308
147sub focus_out { 309sub focus_out {
148 my ($self) = @_; 310 my ($self) = @_;
149 311
150 return unless $FOCUS == $self; 312 return unless $FOCUS == $self;
151 313
152 my $focus = $FOCUS; undef $FOCUS; 314 my $focus = $FOCUS; undef $FOCUS;
315
316 $self->emit (focus_out => $focus);
317
153 $focus->update if $focus; #? 318 $focus->update if $focus; #?
154} 319}
155 320
156sub mouse_motion { } 321sub mouse_motion { }
157sub button_up { } 322sub button_up { }
178 glPushMatrix; 343 glPushMatrix;
179 glTranslate $self->{x}, $self->{y}, 0; 344 glTranslate $self->{x}, $self->{y}, 0;
180 $self->_draw; 345 $self->_draw;
181 glPopMatrix; 346 glPopMatrix;
182 347
183 if ($self == $HOVER) { 348 if ($self == $HOVER && $self->{can_hover}) {
184 my ($x, $y) = @$self{qw(x y)}; 349 my ($x, $y) = @$self{qw(x y)};
185 350
186 glColor 0, 0, 1, 0.2; 351 glColor 1, 0.8, 0.5, 0.2;
187 glEnable GL_BLEND; 352 glEnable GL_BLEND;
188 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 353 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
189 glBegin GL_QUADS; 354 glBegin GL_QUADS;
190 glVertex $x , $y; 355 glVertex $x , $y;
191 glVertex $x + $self->{w}, $y; 356 glVertex $x + $self->{w}, $y;
192 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
193 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
194 glEnd; 359 glEnd;
195 glDisable GL_BLEND; 360 glDisable GL_BLEND;
196 } 361 }
362
363 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix;
365 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0;
369 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h};
372 glEnd;
373 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 }
197} 376}
198 377
199sub _draw { 378sub _draw {
200 my ($self) = @_; 379 my ($self) = @_;
201 380
202 warn "no draw defined for $self\n"; 381 warn "no draw defined for $self\n";
203} 382}
204 383
205sub find_widget { 384sub find_widget {
206 my ($self, $x, $y) = @_; 385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
207 388
208 return $self 389 return $self
209 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
210 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
211 392
212 () 393 ()
213} 394}
214 395
215sub set_parent { 396sub set_parent {
216 my ($self, $par) = @_; 397 my ($self, $parent) = @_;
217 398
218 $self->{parent} = $par;
219 Scalar::Util::weaken $self->{parent}; 399 Scalar::Util::weaken ($self->{parent} = $parent);
220} 400}
221 401
222sub get_parent { 402sub check_size {
403 my ($self) = @_;
404
223 $_[0]->{parent} 405 $self->{parent}
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
224} 426}
225 427
226sub update { 428sub update {
227 my ($self) = @_; 429 my ($self) = @_;
228 430
231} 433}
232 434
233sub connect { 435sub connect {
234 my ($self, $signal, $cb) = @_; 436 my ($self, $signal, $cb) = @_;
235 437
236 push @{ $self->{cb}{$signal} }, $cb; 438 push @{ $self->{signal_cb}{$signal} }, $cb;
237} 439}
238 440
239sub emit { 441sub emit {
240 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
241 443
242 $_->($self, @args) 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
243 for @{$self->{cb}{$signal} || []};
244} 445}
245 446
246sub DESTROY { 447sub DESTROY {
247 my ($self) = @_; 448 my ($self) = @_;
248 449
254package CFClient::UI::DrawBG; 455package CFClient::UI::DrawBG;
255 456
256our @ISA = CFClient::UI::Base::; 457our @ISA = CFClient::UI::Base::;
257 458
258use strict; 459use strict;
259use SDL::OpenGL; 460use CFClient::OpenGL;
260 461
261sub new { 462sub new {
262 my $class = shift; 463 my $class = shift;
263 464
264 # range [value, low, high, page] 465 # range [value, low, high, page]
265 466
266 $class->SUPER::new ( 467 $class->SUPER::new (
267 bg => [0, 0, 0, 0.2], 468 bg => [0, 0, 0, 0.2],
268 active_bg => [1, 1, 1], 469 active_bg => [1, 1, 1, 0.5],
269 @_ 470 @_
270 ) 471 )
271} 472}
272 473
273sub _draw { 474sub _draw {
293 494
294package CFClient::UI::Empty; 495package CFClient::UI::Empty;
295 496
296our @ISA = CFClient::UI::Base::; 497our @ISA = CFClient::UI::Base::;
297 498
499sub new {
500 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg);
502}
503
298sub size_request { 504sub size_request {
299 (0, 0) 505 (0, 0)
300} 506}
301 507
302sub draw { } 508sub draw { }
310sub new { 516sub new {
311 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
312 518
313 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
314 520
315 my $self = $class->SUPER::new (children => [], %arg); 521 my $self = $class->SUPER::new (
522 children => [],
523 can_events => 0,
524 %arg,
525 );
316 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
317 527
318 $self 528 $self
319} 529}
320 530
321sub add { 531sub add {
322 my ($self, $chld) = @_; 532 my ($self, $child) = @_;
323 533
324 $chld->set_parent ($self); 534 $child->set_parent ($self);
535
536 use sort 'stable';
325 537
326 $self->{children} = [ 538 $self->{children} = [
327 sort { $a->{z} <=> $b->{z} } 539 sort { $a->{z} <=> $b->{z} }
328 @{$self->{children}}, $chld 540 @{$self->{children}}, $child
329 ]; 541 ];
330 542
331 $self->{w} = $self->{h} = -1; 543 $child->check_size;
544}
545
546sub children {
547 @{ $_[0]{children} }
548}
549
550sub remove {
551 my ($self, $child) = @_;
552
553 delete $child->{parent};
554 $child->hide;
555
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557
558 $self->check_size;
332 $self->update; 559 $self->update;
333} 560}
334 561
335sub remove { 562sub clear {
336 my ($self, $widget) = @_; 563 my ($self) = @_;
337 564
338 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 565 my $children = delete $self->{children};
566 $self->{children} = [];
339 567
340 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 568 for (@$children) {
569 delete $_->{parent};
570 $_->hide;
571 }
341} 572}
342 573
343sub find_widget { 574sub find_widget {
344 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
345 576
375 606
376 $class->SUPER::new (children => [$child], %arg) 607 $class->SUPER::new (children => [$child], %arg)
377} 608}
378 609
379sub add { 610sub add {
380 my ($self, $widget) = @_; 611 my ($self, $child) = @_;
381 612
382 $self->{children} = []; 613 $self->{children} = [];
383 614
384 $self->SUPER::add ($widget); 615 $self->SUPER::add ($child);
385} 616}
386 617
387sub remove { 618sub remove {
388 my ($self, $widget) = @_; 619 my ($self, $widget) = @_;
389 620
398sub size_request { 629sub size_request {
399 $_[0]{children}[0]->size_request 630 $_[0]{children}[0]->size_request
400} 631}
401 632
402sub size_allocate { 633sub size_allocate {
403 my ($self, $x, $y, $w, $h) = @_; 634 my ($self, $w, $h) = @_;
404 635
405 $self->_size_allocate ($x, $y, $w, $h) or return;
406
407 $self->{children}[0]->size_allocate (0, 0, $w, $h); 636 $self->{children}[0]->configure (0, 0, $w, $h);
408} 637}
409 638
410############################################################################# 639#############################################################################
411 640
412package CFClient::UI::Window; 641package CFClient::UI::Window;
413 642
414our @ISA = CFClient::UI::Bin::; 643our @ISA = CFClient::UI::Bin::;
415 644
416use SDL::OpenGL; 645use CFClient::OpenGL;
417 646
418sub new { 647sub new {
419 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
420 649
421 my $self = $class->SUPER::new (%arg); 650 my $self = $class->SUPER::new (%arg);
422} 651}
423 652
424sub update { 653sub update {
425 my ($self) = @_; 654 my ($self) = @_;
426 655
427 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
428 $self->render_chld;
429 $self->SUPER::update; 657 $self->SUPER::update;
430} 658}
431 659
432sub render_chld {
433 my ($self) = @_;
434
435 $self->{texture} =
436 CFClient::Texture->new_from_opengl (
437 $self->{w}, $self->{h}, sub { $self->child->draw }
438 );
439}
440
441sub size_allocate { 660sub size_allocate {
442 my ($self, $x, $y, $w, $h) = @_; 661 my ($self, $w, $h) = @_;
443 662
444 $self->_size_allocate ($x, $y, $w, $h) or return;
445
446 $self->child->size_allocate (0, 0, $w, $h); 663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
447 666
448 $self->render_chld; 667sub render_child {
668 my ($self) = @_;
669
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw;
674 };
449} 675}
450 676
451sub _draw { 677sub _draw {
452 my ($self) = @_; 678 my ($self) = @_;
453 679
454 my ($w, $h) = ($self->w, $self->h); 680 my ($w, $h) = ($self->w, $self->h);
455 681
456 my $tex = $self->{texture} 682 my $tex = $self->{texture}
457 or return; 683 or return;
684
685 glEnable GL_BLEND;
686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
687 glEnable GL_TEXTURE_2D;
688 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
689 glColor 0, 0, 0, 1;
690
691 $tex->draw_quad (0, 0, $w, $h);
692
693 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D;
695}
696
697#############################################################################
698
699package CFClient::UI::ViewPort;
700
701our @ISA = CFClient::UI::Window::;
702
703sub new { die }
704
705sub size_request {
706 my ($self) = @_;
707
708 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
709 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
710
711 @$self{qw(child_w child_h)}
712}
713
714sub _draw {
715 my ($self) = @_;
716
717 $self->{children}[1]->draw;
718}
719
720
721#############################################################################
722
723package CFClient::UI::Frame;
724
725our @ISA = CFClient::UI::Bin::;
726
727use CFClient::OpenGL;
728
729sub new {
730 my $class = shift;
731
732 my $self = $class->SUPER::new (
733 bg => [1, 1, 1, 1],
734 border_bg => [1, 1, 1, 1],
735 border => 0.8,
736 @_
737 );
738
739 $self
740}
741
742sub _draw {
743 my ($self) = @_;
744
745 my ($w, $h) = ($self->{w}, $self->{h});
458 746
459 glEnable GL_BLEND; 747 glEnable GL_BLEND;
460 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
461 glEnable GL_TEXTURE_2D; 749 glEnable GL_TEXTURE_2D;
462 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
463 751
464 $tex->draw_quad (0, 0, $w, $h); 752# glBegin GL_QUADS;
753# glColor 0, 0, 0, 0;
754# glVertex 0 , 0;
755# glVertex 0 , $h;
756# glVertex $w, $h;
757# glVertex $w, 0;
758# glEnd;
465 759
760
761 $self->child->draw;
466 glDisable GL_BLEND; 762 glDisable GL_BLEND;
467 glDisable GL_TEXTURE_2D; 763 glDisable GL_TEXTURE_2D;
468} 764}
469 765
470############################################################################# 766#############################################################################
471 767
472package CFClient::UI::Frame; 768package CFClient::UI::FancyFrame;
473 769
474our @ISA = CFClient::UI::Bin::; 770our @ISA = CFClient::UI::Bin::;
475 771
476use SDL::OpenGL; 772use CFClient::OpenGL;
773
774my @tex =
775 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
776 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
777
778sub new {
779 my $class = shift;
780
781 # TODO: user_x, user_y, overwrite moveto?
782
783 my $self = $class->SUPER::new (
784 bg => [1, 1, 1, 1],
785 border_bg => [1, 1, 1, 1],
786 border => 0.8,
787 can_events => 1,
788 @_
789 );
790
791 $self->{title} &&= new CFClient::UI::Label
792 align => 0,
793 valign => 1,
794 text => $self->{title},
795 fontsize => 1;
796
797 $self
798}
799
800sub border {
801 int $_[0]{border} * $::FONTSIZE
802}
477 803
478sub size_request { 804sub size_request {
479 my ($self) = @_; 805 my ($self) = @_;
480 my $chld = $self->child
481 or return (0, 0);
482 806
483 $chld->move (2, 2); 807 my ($w, $h) = $self->SUPER::size_request;
484 808
485 map { $_ + 4 } $chld->size_request; 809 (
810 $w + $self->border * 2,
811 $h + $self->border * 2,
812 )
486} 813}
487 814
488sub size_allocate { 815sub size_allocate {
489 my ($self, $x, $y, $w, $h) = @_; 816 my ($self, $w, $h) = @_;
490
491 $self->_size_allocate ($x, $y, $w, $h) or return;
492 817
493 $self->child->size_allocate (2, 2, $w - 4, $h - 4); 818 $h -= List::Util::max 0, $self->border * 2;
494} 819 $w -= List::Util::max 0, $self->border * 2;
495 820
496sub _draw { 821 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
497 my ($self) = @_; 822 if $self->{title};
498 823
499 my $chld = $self->child; 824 $self->child->configure ($self->border, $self->border, $w, $h);
500
501 my ($w, $h) = $chld->size_request;
502
503 glBegin GL_QUADS;
504 glColor 0, 0, 0;
505 glVertex 0 , 0;
506 glVertex 0 , $h + 4;
507 glVertex $w + 4 , $h + 4;
508 glVertex $w + 4 , 0;
509 glEnd;
510
511 $chld->draw;
512}
513
514#############################################################################
515
516package CFClient::UI::FancyFrame;
517
518our @ISA = CFClient::UI::Bin::;
519
520use SDL::OpenGL;
521
522my @tex =
523 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
524 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
525
526sub size_request {
527 my ($self) = @_;
528
529 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
530
531 my ($w, $h) = $self->SUPER::size_request;
532
533 $h += $tex[1]->{h};
534 $h += $tex[4]->{h};
535 $w += $tex[2]->{w};
536 $w += $tex[3]->{w};
537
538 ($w, $h)
539}
540
541sub size_allocate {
542 my ($self, $x, $y, $w, $h) = @_;
543
544 $self->_size_allocate ($x, $y, $w, $h) or return;
545
546 $h -= $tex[1]{h};
547 $h -= $tex[4]{h};
548 $w -= $tex[2]{w};
549 $w -= $tex[3]{w};
550
551 $h = $h < 0 ? 0 : $h;
552 $w = $w < 0 ? 0 : $w;
553
554 my $child = $self->child;
555
556 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
557} 825}
558 826
559sub button_down { 827sub button_down {
560 my ($self, $ev, $x, $y) = @_; 828 my ($self, $ev, $x, $y) = @_;
561 829
830 my $border = $self->border;
831
562 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} 832 if ($x < $self->{w} && $x >= $self->{w} - $border
563 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { 833 && $y < $self->{h} && $y >= $self->{h} - $border) {
564 834
565 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 835 my ($ox, $oy) = ($ev->{x}, $ev->{y});
566 my ($bw, $bh) = ($self->{w}, $self->{h}); 836 my ($bw, $bh) = ($self->{w}, $self->{h});
567 837
568 $self->{motion} = sub { 838 $self->{motion} = sub {
569 my ($ev, $x, $y) = @_; 839 my ($ev, $x, $y) = @_;
570 840
571 ($x, $y) = ($ev->motion_x, $ev->motion_y); 841 ($x, $y) = ($ev->{x}, $ev->{y});
572 842
573 $self->{user_w} = $bw + $x - $ox; 843 $self->{user_w} = $bw + $x - $ox;
574 $self->{user_h} = $bh + $y - $oy; 844 $self->{user_h} = $bh + $y - $oy;
575 $self->update; 845 $self->check_size;
576 }; 846 };
577 847
578 } elsif ($x >= 0 && $x < $self->{w} 848 } elsif ($x >= 0 && $x < $self->{w}
579 && $y >= 0 && $y < $tex[1]{h}) { 849 && $y >= 0 && $y < $border) {
580 850
581 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 851 my ($ox, $oy) = ($ev->{x}, $ev->{y});
582 my ($bx, $by) = ($self->{x}, $self->{y}); 852 my ($bx, $by) = ($self->{x}, $self->{y});
583 853
584 $self->{motion} = sub { 854 $self->{motion} = sub {
585 my ($ev, $x, $y) = @_; 855 my ($ev, $x, $y) = @_;
586 856
587 ($x, $y) = ($ev->motion_x, $ev->motion_y); 857 ($x, $y) = ($ev->{x}, $ev->{y});
588 858
589 $self->move ($bx + $x - $ox, $by + $y - $oy); 859 $self->move ($bx + $x - $ox, $by + $y - $oy);
590 $self->update; 860 $self->update;
591 }; 861 };
592 } 862 }
605} 875}
606 876
607sub _draw { 877sub _draw {
608 my ($self) = @_; 878 my ($self) = @_;
609 879
610 my ($w, $h) = ($self->{w}, $self->{h}); 880 my ($w, $h ) = ($self->{w}, $self->{h});
611 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 881 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
612 882
613 glEnable GL_BLEND; 883 glEnable GL_BLEND;
614 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 884 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
615 glEnable GL_TEXTURE_2D; 885 glEnable GL_TEXTURE_2D;
616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 886 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
617 887
618 my $top = $tex[1]; 888 my $border = $self->border;
889
890 glColor @{ $self->{border_bg} };
619 $top->draw_quad (0, 0, $w, $top->{h}); 891 $tex[1]->draw_quad (0, 0, $w, $border);
620 892 $tex[3]->draw_quad (0, $border, $border, $ch);
621 my $left = $tex[3]; 893 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
622 $left->draw_quad (0, $top->{h}, $left->{w}, $ch); 894 $tex[4]->draw_quad (0, $h - $border, $w, $border);
623
624 my $right = $tex[2];
625 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
626
627 my $bottom = $tex[4];
628 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
629 895
630 my $bg = $tex[0]; 896 my $bg = $tex[0];
631 897
632 glBindTexture GL_TEXTURE_2D, $bg->{name}; 898 # TODO: repeat texture not scale
633 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
634 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
635 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
636
637 my $rep_x = $cw / $bg->{w}; 899 my $rep_x = $cw / $bg->{w};
638 my $rep_y = $ch / $bg->{h}; 900 my $rep_y = $ch / $bg->{h};
639 901
640 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); 902 glColor @{ $self->{bg} };
903
904 $bg->{s} = $rep_x;
905 $bg->{t} = $rep_y;
906 $bg->{wrap_mode} = 1;
907 $bg->draw_quad ($border, $border, $cw, $ch);
641 908
642 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
643 glDisable GL_BLEND; 910 glDisable GL_BLEND;
644 911
912 $self->{title}->draw if $self->{title};
645 $self->child->draw; 913 $self->child->draw;
646
647} 914}
648 915
649############################################################################# 916#############################################################################
650 917
651package CFClient::UI::Table; 918package CFClient::UI::Table;
652 919
653our @ISA = CFClient::UI::Base::; 920our @ISA = CFClient::UI::Base::;
654 921
655use List::Util qw(max sum); 922use List::Util qw(max sum);
656 923
657use SDL::OpenGL; 924use CFClient::OpenGL;
658 925
659sub new { 926sub new {
660 my $class = shift; 927 my $class = shift;
661 928
662 $class->SUPER::new ( 929 $class->SUPER::new (
664 @_ 931 @_
665 ) 932 )
666} 933}
667 934
668sub add { 935sub add {
669 my ($self, $x, $y, $chld) = @_; 936 my ($self, $x, $y, $child) = @_;
670 937
938 $child->set_parent ($self);
671 $self->{children}[$y][$x] = $chld; 939 $self->{children}[$y][$x] = $child;
672 $chld->set_parent ($self);
673 940
674 $self->{w} = $self->{h} = -1; 941 $child->check_size;
942}
943
944sub children {
945 grep $_, map @$_, grep $_, @{ $_[0]{children} }
946}
947
948# TODO: move to container class maybe? send childs a signal on removal?
949sub clear {
950 my ($self) = @_;
951
952 my @children = $self->children;
953 delete $self->{children};
954
955 for (@children) {
956 delete $_->{parent};
957 $_->hide;
958 }
959
675 $self->update; 960 $self->update;
676} 961}
677 962
678sub get_wh { 963sub get_wh {
679 my ($self) = @_; 964 my ($self) = @_;
685 or next; 970 or next;
686 971
687 for my $x (0 .. $#$row) { 972 for my $x (0 .. $#$row) {
688 my $widget = $row->[$x] 973 my $widget = $row->[$x]
689 or next; 974 or next;
690 my ($w, $h) = $widget->size_request; 975 my ($w, $h) = @$widget{qw(req_w req_h)};
691 976
692 $w[$x] = max $w[$x], $w; 977 $w[$x] = max $w[$x], $w;
693 $h[$y] = max $h[$y], $h; 978 $h[$y] = max $h[$y], $h;
694 } 979 }
695 } 980 }
707 (sum @$hs), 992 (sum @$hs),
708 ) 993 )
709} 994}
710 995
711sub size_allocate { 996sub size_allocate {
712 my ($self, $x, $y, $w, $h) = @_; 997 my ($self, $w, $h) = @_;
713
714 $self->_size_allocate ($x, $y, $w, $h) or return;
715 998
716 my ($ws, $hs) = $self->get_wh; 999 my ($ws, $hs) = $self->get_wh;
717 1000
718 my $req_w = sum @$ws; 1001 my $req_w = sum @$ws;
719 my $req_h = sum @$hs; 1002 my $req_h = sum @$hs;
725 1008
726 # linearly scale sizes 1009 # linearly scale sizes
727 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1010 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1011 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
729 1012
1013 CFClient::UI::harmonize $ws;
1014 CFClient::UI::harmonize $hs;
1015
730 my $y; 1016 my $y;
731 1017
732 for my $r (0 .. $#{$self->{children}}) { 1018 for my $r (0 .. $#{$self->{children}}) {
733 my $row = $self->{children}[$r] 1019 my $row = $self->{children}[$r]
734 or next; 1020 or next;
735 1021
736 my $x = 0; 1022 my $x = 0;
737 my $row_h = $hs->[$r]; 1023 my $row_h = $hs->[$r];
738 1024
739 for my $c (0 .. $#$row) { 1025 for my $c (0 .. $#$row) {
740 my $widget = $row->[$c]
741 or next;
742
743 my $col_w = $ws->[$c]; 1026 my $col_w = $ws->[$c];
744 1027
1028 if (my $widget = $row->[$c]) {
745 $widget->size_allocate ($x, $y, $col_w, $row_h); 1029 $widget->configure ($x, $y, $col_w, $row_h);
1030 }
746 1031
747 $x += $col_w; 1032 $x += $col_w;
748 } 1033 }
749 1034
750 $y += $row_h; 1035 $y += $row_h;
794 (List::Util::max map $_->[1], @alloc), 1079 (List::Util::max map $_->[1], @alloc),
795 ) 1080 )
796} 1081}
797 1082
798sub size_allocate { 1083sub size_allocate {
799 my ($self, $x, $y, $w, $h) = @_; 1084 my ($self, $w, $h) = @_;
800
801 $self->_size_allocate ($x, $y, $w, $h) or return;
802
803 return unless $self->{w};
804 1085
805 ($h, $w) = ($w, $h); 1086 ($h, $w) = ($w, $h);
806 1087
807 my $children = $self->{children}; 1088 my $children = $self->{children};
808 1089
809 my @h = map +($_->size_request)[0], @$children; 1090 my @h = map $_->{req_w}, @$children;
810 1091
811 my $req_h = List::Util::sum @h; 1092 my $req_h = List::Util::sum @h;
812 1093
813 if ($req_h > $h) { 1094 if ($req_h > $h) {
814 # ah well, not enough space 1095 # ah well, not enough space
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 1105 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h; 1106 $h[$_] = $alloc_h;
826 } 1107 }
827 } 1108 }
828 1109
1110 CFClient::UI::harmonize \@h;
1111
829 my $y = 0; 1112 my $y = 0;
830 for (0 .. $#$children) { 1113 for (0 .. $#$children) {
831 my $child = $children->[$_]; 1114 my $child = $children->[$_];
832 my $h = $h[$_]; 1115 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w); 1116 $child->configure ($y, 0, $h, $w);
834 1117
835 $y += $h; 1118 $y += $h;
836 } 1119 }
1120
1121 1
837} 1122}
838 1123
839############################################################################# 1124#############################################################################
840 1125
841package CFClient::UI::VBox; 1126package CFClient::UI::VBox;
854 (List::Util::sum map $_->[1], @alloc), 1139 (List::Util::sum map $_->[1], @alloc),
855 ) 1140 )
856} 1141}
857 1142
858sub size_allocate { 1143sub size_allocate {
859 my ($self, $x, $y, $w, $h) = @_; 1144 my ($self, $w, $h) = @_;
860
861 $self->_size_allocate ($x, $y, $w, $h) or return;
862
863 return unless $self->{h};
864 1145
865 my $children = $self->{children}; 1146 my $children = $self->{children};
866 1147
867 my @h = map +($_->size_request)[1], @$children; 1148 my @h = map $_->{req_h}, @$children;
868 1149
869 my $req_h = List::Util::sum @h; 1150 my $req_h = List::Util::sum @h;
870 1151
871 if ($req_h > $h) { 1152 if ($req_h > $h) {
872 # ah well, not enough space 1153 # ah well, not enough space
880 1161
881 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 1162 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
882 } 1163 }
883 } 1164 }
884 1165
1166 CFClient::UI::harmonize \@h;
1167
885 my $y = 0; 1168 my $y = 0;
886 for (0 .. $#$children) { 1169 for (0 .. $#$children) {
887 my $child = $children->[$_]; 1170 my $child = $children->[$_];
888 my $h = $h[$_]; 1171 my $h = $h[$_];
889 $child->size_allocate (0, $y, $w, $h); 1172 $child->configure (0, $y, $w, $h);
890 1173
891 $y += $h; 1174 $y += $h;
892 } 1175 }
1176
1177 1
893} 1178}
894 1179
895############################################################################# 1180#############################################################################
896 1181
897package CFClient::UI::Label; 1182package CFClient::UI::Label;
898 1183
899our @ISA = CFClient::UI::Base::; 1184our @ISA = CFClient::UI::Base::;
900 1185
901use SDL::OpenGL; 1186use CFClient::OpenGL;
902 1187
903sub new { 1188sub new {
904 my ($class, %arg) = @_; 1189 my ($class, %arg) = @_;
905 1190
906 my $self = $class->SUPER::new ( 1191 my $self = $class->SUPER::new (
907 fg => [1, 1, 1], 1192 fg => [1, 1, 1],
908 height => $::FONTSIZE, 1193 #font => default_font
1194 fontsize => 1,
909 text => "", 1195 text => "",
910 align => -1, 1196 align => -1,
1197 valign => -1,
911 padding => 2, 1198 padding => 2,
912 layout => new CFClient::Layout, 1199 layout => new CFClient::Layout,
1200 can_events => 0,
913 %arg 1201 %arg
914 ); 1202 );
915 1203
916 $self->set_text ($self->{text}); 1204 if (exists $self->{template}) {
1205 my $layout = new CFClient::Layout;
1206 $layout->set_text (delete $self->{template});
1207 $self->{template} = $layout;
1208 }
1209
1210 $self->set_text (delete $self->{text}) if exists $self->{text};
1211 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
917 1212
918 $self 1213 $self
919} 1214}
920 1215
921sub escape_text { 1216sub escape {
922 local $_ = $_[1]; 1217 local $_ = $_[1];
923 1218
924 s/&/&amp;/g; 1219 s/&/&amp;/g;
925 s/>/&gt;/g; 1220 s/>/&gt;/g;
926 s/</&lt;/g; 1221 s/</&lt;/g;
927 1222
928 $_[1] 1223 $_[1]
929} 1224}
930 1225
1226sub update {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230 $self->SUPER::update;
1231}
1232
1233sub reconfigure {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237}
1238
931sub set_text { 1239sub set_text {
932 my ($self, $text) = @_; 1240 my ($self, $text) = @_;
933 1241
1242 return if $self->{text} eq "T$text";
934 $self->{text} = $text; 1243 $self->{text} = "T$text";
1244
935 $self->{layout}->set_markup ($text); 1245 $self->{layout}->set_text ($text);
936 1246
937 delete $self->{texture}; 1247 delete $self->{texture};
938 $self->update; 1248 $self->update;
1249 $self->check_size;
939} 1250}
940 1251
941sub get_text { 1252sub set_markup {
942 my ($self, $text) = @_; 1253 my ($self, $markup) = @_;
943 1254
944 $self->{text} 1255 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup";
1257
1258 $self->{layout}->set_markup ($markup);
1259
1260 delete $self->{texture};
1261 $self->update;
1262 $self->check_size;
945} 1263}
946 1264
947sub size_request { 1265sub size_request {
948 my ($self) = @_; 1266 my ($self) = @_;
949 1267
950 $self->{layout}->set_width; 1268 $self->{layout}->set_font ($self->{font}) if $self->{font};
1269 $self->{layout}->set_width ($self->{max_w} || -1);
951 $self->{layout}->set_height ($self->{height}); 1270 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1271
952 my ($w, $h) = $self->{layout}->size; 1272 my ($w, $h) = $self->{layout}->size;
1273
1274 if (exists $self->{template}) {
1275 $self->{template}->set_font ($self->{font}) if $self->{font};
1276 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1277
1278 my ($w2, $h2) = $self->{template}->size;
1279
1280 $w = List::Util::max $w, $w2;
1281 $h = List::Util::max $h, $h2;
1282 }
953 1283
954 ( 1284 (
955 $w + $self->{padding} * 2, 1285 $w + $self->{padding} * 2,
956 $h + $self->{padding} * 2, 1286 $h + $self->{padding} * 2,
957 ) 1287 )
958} 1288}
959 1289
960sub size_allocate { 1290sub size_allocate {
961 my ($self, $x, $y, $w, $h) = @_; 1291 my ($self, $w, $h) = @_;
962
963 $self->_size_allocate ($x, $y, $w, $h) or return;
964 1292
965 delete $self->{texture}; 1293 delete $self->{texture};
966} 1294}
967 1295
968sub update { 1296sub set_fontsize {
969 my ($self) = @_; 1297 my ($self, $fontsize) = @_;
970 1298
1299 $self->{fontsize} = $fontsize;
971 delete $self->{texture}; 1300 delete $self->{texture};
1301 $self->check_size;
972 $self->SUPER::update; 1302 $self->update;
973} 1303}
974 1304
975sub _draw { 1305sub _draw {
976 my ($self) = @_; 1306 my ($self) = @_;
977 1307
978 my $tex = $self->{texture} ||= do { 1308 my $tex = $self->{texture} ||= do {
1309 $self->{layout}->set_font ($self->{font}) if $self->{font};
979 $self->{layout}->set_width ($self->{w}); 1310 $self->{layout}->set_width ($self->{w});
980 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{height}); 1311 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
981 new_from_layout CFClient::Texture $self->{layout} 1312 new_from_layout CFClient::Texture $self->{layout}
982 }; 1313 };
983 1314
984 glEnable GL_BLEND; 1315 glEnable GL_BLEND;
985 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1316 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
986 glEnable GL_TEXTURE_2D; 1317 glEnable GL_TEXTURE_2D;
987 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
988 1319
989 glColor @{$self->{fg}}; 1320 glColor @{$self->{fg}};
990 1321
991 my $x = 1322 $self->{ox} = int (
992 $self->{align} < 0 ? $self->{padding} 1323 $self->{align} < 0 ? $self->{padding}
993 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1324 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
994 : ($self->{w} - $tex->{w}) * 0.5; 1325 : ($self->{w} - $tex->{w}) * 0.5
1326 );
995 1327
996 $tex->draw_quad ($x, $self->{padding}); 1328 $self->{oy} = int (
1329 $self->{valign} < 0 ? $self->{padding}
1330 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1331 : ($self->{h} - $tex->{h}) * 0.5
1332 );
1333
1334 $tex->draw_quad ($self->{ox}, $self->{oy});
997 1335
998 glDisable GL_TEXTURE_2D; 1336 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND; 1337 glDisable GL_BLEND;
1000} 1338}
1001 1339
1002############################################################################# 1340#############################################################################
1003 1341
1004package CFClient::UI::Entry; 1342package CFClient::UI::EntryBase;
1005 1343
1006our @ISA = CFClient::UI::Label::; 1344our @ISA = CFClient::UI::Label::;
1007 1345
1008use SDL; 1346use CFClient::OpenGL;
1009use SDL::OpenGL;
1010 1347
1011sub new { 1348sub new {
1012 my $class = shift; 1349 my $class = shift;
1013 1350
1014 $class->SUPER::new ( 1351 $class->SUPER::new (
1015 fg => [1, 1, 1], 1352 fg => [1, 1, 1],
1016 bg => [0, 0, 0, 0.2], 1353 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1], 1354 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0], 1355 active_fg => [0, 0, 0],
1356 can_hover => 1,
1357 can_focus => 1,
1358 valign => 0,
1359 can_events => 1,
1019 @_ 1360 @_
1020 ) 1361 )
1021} 1362}
1022 1363
1023sub _set_text { 1364sub _set_text {
1024 my ($self, $text) = @_; 1365 my ($self, $text) = @_;
1025 1366
1367 delete $self->{cur_h};
1368
1369 return if $self->{text} eq $text;
1370
1371 delete $self->{texture};
1372
1026 $self->{last_activity} = $::NOW; 1373 $self->{last_activity} = $::NOW;
1027
1028 $self->{text} = $text; 1374 $self->{text} = $text;
1029 $self->{layout}->set_width ($self->{w});
1030 1375
1031 $text =~ s/./*/g if $self->{hidden}; 1376 $text =~ s/./*/g if $self->{hidden};
1377 $self->{layout}->set_text ("$text ");
1032 1378
1033 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1379 $self->emit (changed => $self->{text});
1380}
1034 1381
1035 $text = substr $text, 0, $self->{cursor}; 1382sub get_text {
1036 utf8::encode $text; 1383 $_[0]{text}
1037
1038 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1039} 1384}
1040 1385
1041sub size_request { 1386sub size_request {
1042 my ($self) = @_; 1387 my ($self) = @_;
1043 1388
1045 1390
1046 ($w + 1, $h) # add 1 for cursor 1391 ($w + 1, $h) # add 1 for cursor
1047} 1392}
1048 1393
1049sub size_allocate { 1394sub size_allocate {
1050 my ($self, $x, $y, $w, $h) = @_; 1395 my ($self, $w, $h) = @_;
1051 1396
1052 $self->SUPER::size_allocate ($x, $y, $w, $h); 1397 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1053
1054 $self->_set_text ($self->{text});
1055} 1398}
1056 1399
1057sub set_text { 1400sub set_text {
1058 my ($self, $text) = @_; 1401 my ($self, $text) = @_;
1059 1402
1063} 1406}
1064 1407
1065sub key_down { 1408sub key_down {
1066 my ($self, $ev) = @_; 1409 my ($self, $ev) = @_;
1067 1410
1068 my $mod = $ev->key_mod; 1411 my $mod = $ev->{mod};
1069 my $sym = $ev->key_sym; 1412 my $sym = $ev->{sym};
1070
1071 my $uni = $ev->key_unicode; 1413 my $uni = $ev->{unicode};
1072 1414
1073 my $text = $self->get_text; 1415 my $text = $self->get_text;
1074 1416
1075 if ($sym == SDLK_BACKSPACE) { 1417 if ($sym == 8) {
1076 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1418 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1077 } elsif ($sym == SDLK_DELETE) { 1419 } elsif ($sym == 127) {
1078 substr $text, $self->{cursor}, 1, ""; 1420 substr $text, $self->{cursor}, 1, "";
1079 } elsif ($sym == SDLK_LEFT) { 1421 } elsif ($sym == CFClient::SDLK_LEFT) {
1080 --$self->{cursor} if $self->{cursor}; 1422 --$self->{cursor} if $self->{cursor};
1081 } elsif ($sym == SDLK_RIGHT) { 1423 } elsif ($sym == CFClient::SDLK_RIGHT) {
1082 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1424 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1083 } elsif ($sym == SDLK_HOME) { 1425 } elsif ($sym == CFClient::SDLK_HOME) {
1084 $self->{cursor} = 0; 1426 $self->{cursor} = 0;
1085 } elsif ($sym == SDLK_END) { 1427 } elsif ($sym == CFClient::SDLK_END) {
1086 $self->{cursor} = length $text; 1428 $self->{cursor} = length $text;
1429 } elsif ($sym == 27) {
1430 $self->emit ('escape');
1087 } elsif ($uni) { 1431 } elsif ($uni) {
1088 substr $text, $self->{cursor}++, 0, chr $uni; 1432 substr $text, $self->{cursor}++, 0, chr $uni;
1089 } 1433 }
1090 1434
1091 $self->_set_text ($text); 1435 $self->_set_text ($text);
1145 1489
1146 $self->SUPER::_draw; 1490 $self->SUPER::_draw;
1147 1491
1148 #TODO: force update every cursor change :( 1492 #TODO: force update every cursor change :(
1149 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1493 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1494
1495 unless (exists $self->{cur_h}) {
1496 my $text = substr $self->{text}, 0, $self->{cursor};
1497 utf8::encode $text;
1498
1499 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1500 }
1501
1150 glColor @{$self->{fg}}; 1502 glColor @{$self->{fg}};
1151 glBegin GL_LINES; 1503 glBegin GL_LINES;
1152 glVertex $self->{cur_x}, $self->{cur_y};
1153 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1504 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1505 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1154 glEnd; 1506 glEnd;
1155 } 1507 }
1156} 1508}
1157 1509
1158#############################################################################
1159
1160package CFClient::UI::Slider; 1510package CFClient::UI::Entry;
1161 1511
1162use strict; 1512our @ISA = CFClient::UI::EntryBase::;
1163 1513
1164use SDL::OpenGL; 1514use CFClient::OpenGL;
1165 1515
1516sub key_down {
1517 my ($self, $ev) = @_;
1518
1519 my $sym = $ev->{sym};
1520
1521 if ($sym == 13) {
1522 unshift @{$self->{history}},
1523 my $txt = $self->get_text;
1524 $self->{history_pointer} = -1;
1525 $self->{history_saveback} = '';
1526 $self->emit (activate => $txt);
1527 $self->update;
1528
1529 } elsif ($sym == CFClient::SDLK_UP) {
1530 if ($self->{history_pointer} < 0) {
1531 $self->{history_saveback} = $self->get_text;
1532 }
1533 if (@{$self->{history} || []} > 0) {
1534 $self->{history_pointer}++;
1535 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1536 $self->{history_pointer} = @{$self->{history} || []} - 1;
1537 }
1538 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1539 }
1540
1541 } elsif ($sym == CFClient::SDLK_DOWN) {
1542 $self->{history_pointer}--;
1543 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1544
1545 if ($self->{history_pointer} >= 0) {
1546 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1547 } else {
1548 $self->set_text ($self->{history_saveback});
1549 }
1550
1551 } else {
1552 $self->SUPER::key_down ($ev);
1553 }
1554
1555}
1556
1557#############################################################################
1558
1559package CFClient::UI::Button;
1560
1166our @ISA = CFClient::UI::DrawBG::; 1561our @ISA = CFClient::UI::Label::;
1562
1563use CFClient::OpenGL;
1564
1565my @tex =
1566 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1567 qw(b1_button_active.png);
1167 1568
1168sub new { 1569sub new {
1169 my $class = shift; 1570 my $class = shift;
1170 1571
1572 $class->SUPER::new (
1573 padding => 4,
1574 fg => [1, 1, 1],
1575 bg => [1, 1, 1, 0.2],
1576 active_fg => [0, 0, 1],
1577 can_hover => 1,
1578 align => 0,
1579 valign => 0,
1580 can_events => 1,
1581 @_
1582 )
1583}
1584
1585sub button_up {
1586 my ($self, $ev, $x, $y) = @_;
1587
1588 if ($x >= 0 && $x < $self->{w}
1589 && $y >= 0 && $y < $self->{h}) {
1590 $self->emit ("activate");
1591 }
1592}
1593
1594sub _draw {
1595 my ($self) = @_;
1596
1597 local $self->{fg} = $self->{fg};
1598
1599 if ($GRAB == $self) {
1600 $self->{fg} = $self->{active_fg};
1601 }
1602
1603 glEnable GL_BLEND;
1604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1605 glEnable GL_TEXTURE_2D;
1606 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1607 glColor 0, 0, 0, 1;
1608
1609 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1610
1611 glDisable GL_TEXTURE_2D;
1612 glDisable GL_BLEND;
1613
1614 $self->SUPER::_draw;
1615}
1616
1617#############################################################################
1618
1619package CFClient::UI::CheckBox;
1620
1621our @ISA = CFClient::UI::DrawBG::;
1622
1623my @tex =
1624 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1625 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1626
1627use CFClient::OpenGL;
1628
1629sub new {
1630 my $class = shift;
1631
1632 $class->SUPER::new (
1633 padding => 2,
1634 fg => [1, 1, 1],
1635 active_fg => [1, 1, 0],
1636 state => 0,
1637 can_hover => 1,
1638 @_
1639 )
1640}
1641
1642sub size_request {
1643 my ($self) = @_;
1644
1645 ($self->{padding} * 2 + 6) x 2
1646}
1647
1648sub button_down {
1649 my ($self, $ev, $x, $y) = @_;
1650
1651 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1652 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1653 $self->{state} = !$self->{state};
1654 $self->emit (changed => $self->{state});
1655 }
1656}
1657
1658sub _draw {
1659 my ($self) = @_;
1660
1661 $self->SUPER::_draw;
1662
1663 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1664
1665 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1666
1667 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1668
1669 glEnable GL_BLEND;
1670 glEnable GL_TEXTURE_2D;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672
1673 my $tex = $self->{state} ? $tex[1] : $tex[0];
1674
1675 $tex->draw_quad (0, 0, $s, $s);
1676
1677 glDisable GL_TEXTURE_2D;
1678 glDisable GL_BLEND;
1679}
1680
1681#############################################################################
1682
1683package CFClient::UI::Image;
1684
1685our @ISA = CFClient::UI::Base::;
1686
1687use CFClient::OpenGL;
1688use Carp qw/confess/;
1689
1690our %loaded_images;
1691
1692sub new {
1693 my $class = shift;
1694
1695 my $self = $class->SUPER::new (can_events => 0, @_);
1696
1697 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1698
1699 $loaded_images{$self->{image}} ||=
1700 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1701
1702 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1703
1704 Scalar::Util::weaken $loaded_images{$self->{image}};
1705
1706 $self->{aspect} = $tex->{w} / $tex->{h};
1707
1708 $self
1709}
1710
1711sub size_request {
1712 my ($self) = @_;
1713
1714 ($self->{tex}->{w}, $self->{tex}->{h})
1715}
1716
1717sub _draw {
1718 my ($self) = @_;
1719
1720 my $tex = $self->{tex};
1721
1722 my ($w, $h) = ($self->{w}, $self->{h});
1723
1724 if ($self->{rot90}) {
1725 glRotate 90, 0, 0, 1;
1726 glTranslate 0, -$self->{w}, 0;
1727
1728 ($w, $h) = ($h, $w);
1729 }
1730
1731 glEnable GL_BLEND;
1732 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1733 glEnable GL_TEXTURE_2D;
1734 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1735
1736 $tex->draw_quad (0, 0, $w, $h);
1737
1738 glDisable GL_BLEND;
1739 glDisable GL_TEXTURE_2D;
1740}
1741
1742#############################################################################
1743
1744package CFClient::UI::VGauge;
1745
1746our @ISA = CFClient::UI::Base::;
1747
1748use List::Util qw(min max);
1749
1750use CFClient::OpenGL;
1751
1752my %tex = (
1753 food => [
1754 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1755 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1756 ],
1757 grace => [
1758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1759 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1760 ],
1761 hp => [
1762 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1763 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1764 ],
1765 mana => [
1766 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1767 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1768 ],
1769);
1770
1771# eg. VGauge->new (gauge => 'food'), default gauge: food
1772sub new {
1773 my $class = shift;
1774
1775 my $self = $class->SUPER::new (
1776 type => 'food',
1777 @_
1778 );
1779
1780 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1781
1782 $self
1783}
1784
1785sub size_request {
1786 my ($self) = @_;
1787
1788 #my $tex = $tex{$self->{type}}[0];
1789 #@$tex{qw(w h)}
1790 (0, 0)
1791}
1792
1793sub set_max {
1794 my ($self, $max) = @_;
1795
1796 return if $self->{max_val} == $max;
1797
1798 $self->{max_val} = $max;
1799 $self->update;
1800}
1801
1802sub set_value {
1803 my ($self, $val, $max) = @_;
1804
1805 $self->set_max ($max)
1806 if defined $max;
1807
1808 return if $self->{val} == $val;
1809
1810 $self->{val} = $val;
1811 $self->update;
1812}
1813
1814sub _draw {
1815 my ($self) = @_;
1816
1817 my $tex = $tex{$self->{type}};
1818 my ($t1, $t2, $t3) = @$tex;
1819
1820 my ($w, $h) = ($self->{w}, $self->{h});
1821
1822 if ($self->{vertical}) {
1823 glRotate 90, 0, 0, 1;
1824 glTranslate 0, -$self->{w}, 0;
1825
1826 ($w, $h) = ($h, $w);
1827 }
1828
1829 my $ycut = $self->{val} / ($self->{max_val} || 1);
1830
1831 my $ycut1 = max 0, min 1, $ycut;
1832 my $ycut2 = max 0, min 1, $ycut - 1;
1833
1834 my $h1 = $self->{h} * (1 - $ycut1);
1835 my $h2 = $self->{h} * (1 - $ycut2);
1836
1837 glEnable GL_BLEND;
1838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1839 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841
1842 glBindTexture GL_TEXTURE_2D, $t1->{name};
1843 glBegin GL_QUADS;
1844 glTexCoord 0 , 0; glVertex 0 , 0;
1845 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1846 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1847 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1848 glEnd;
1849
1850 my $ycut1 = List::Util::min 1, $ycut;
1851 glBindTexture GL_TEXTURE_2D, $t2->{name};
1852 glBegin GL_QUADS;
1853 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1854 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1855 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1856 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1857 glEnd;
1858
1859 if ($t3) {
1860 glBindTexture GL_TEXTURE_2D, $t3->{name};
1861 glBegin GL_QUADS;
1862 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1863 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1864 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1865 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1866 glEnd;
1867 }
1868
1869 glDisable GL_BLEND;
1870 glDisable GL_TEXTURE_2D;
1871}
1872
1873#############################################################################
1874
1875package CFClient::UI::Gauge;
1876
1877our @ISA = CFClient::UI::VBox::;
1878
1879sub new {
1880 my ($class, %arg) = @_;
1881
1882 my $self = $class->SUPER::new (
1883 tooltip => $arg{type},
1884 can_hover => 1,
1885 can_events => 1,
1886 %arg,
1887 );
1888
1889 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1890 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1891 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1892
1893 $self
1894}
1895
1896sub set_fontsize {
1897 my ($self, $fsize) = @_;
1898
1899 $self->{value}->set_fontsize ($fsize);
1900 $self->{max} ->set_fontsize ($fsize);
1901}
1902
1903sub set_max {
1904 my ($self, $max) = @_;
1905
1906 $self->{gauge}->set_max ($max);
1907 $self->{max}->set_text ($max);
1908}
1909
1910sub set_value {
1911 my ($self, $val, $max) = @_;
1912
1913 $self->set_max ($max)
1914 if defined $max;
1915
1916 $self->{gauge}->set_value ($val, $max);
1917 $self->{value}->set_text ($val);
1918}
1919
1920#############################################################################
1921
1922package CFClient::UI::Slider;
1923
1924use strict;
1925
1926use CFClient::OpenGL;
1927
1928our @ISA = CFClient::UI::DrawBG::;
1929
1930my @tex =
1931 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1932 qw(s1_slider.png s1_slider_bg.png);
1933
1934sub new {
1935 my $class = shift;
1936
1171 # range [value, low, high, page] 1937 # range [value, low, high, page]
1172 1938
1939 # TODO: 0-width page
1940 # TODO: req_w/h are wrong with vertical
1941 # TODO: calculations are off
1173 my $self = $class->SUPER::new ( 1942 my $self = $class->SUPER::new (
1174 fg => [1, 1, 1], 1943 fg => [1, 1, 1],
1175 active_fg => [0, 0, 0], 1944 active_fg => [0, 0, 0],
1176 range => [0, 0, 100, 10], 1945 range => [0, 0, 100, 10],
1177 req_w => 40, 1946 req_w => 20,
1178 req_h => 10, 1947 req_h => 20,
1179 vertical => 0, 1948 vertical => 0,
1949 can_hover => 1,
1950 inner_pad => 5,
1180 @_ 1951 @_
1181 ); 1952 );
1182 1953
1183 $self 1954 $self
1184} 1955}
1205 if ($GRAB == $self) { 1976 if ($GRAB == $self) {
1206 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1977 my ($value, $lo, $hi, $page) = @{$self->{range}};
1207 1978
1208 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1979 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1209 1980
1981 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1982 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1983
1984 $x -= $inner_pad_px; # substract the padding
1210 $x = $x * ($hi - $lo) / $w + $lo; 1985 $x = $x * ($hi - $lo) / $inner_w + $lo;
1211 $x = $lo if $x < $lo; 1986 $x = $lo if $x < $lo;
1212 $x = $hi - $page if $x > $hi - $page; 1987 $x = $hi - $page if $x > $hi - $page;
1213 $self->{range}[0] = $x; 1988 $self->{range}[0] = $x;
1214 1989
1215 $self->emit (changed => $x); 1990 $self->emit (changed => $x);
1216 $self->update; 1991 $self->update;
1217 } 1992 }
1993}
1994
1995# the inner_* stuff is for generating a padding for the slider handle,
1996# so that the handle doesn't leave the texture. This calculation isn't 100%
1997# correct propably, but it does the job for now
1998sub _calc_inner_pad_px {
1999 my ($self, $w) = @_;
2000 ($w / 100) * $self->{inner_pad} # % to pixels
1218} 2001}
1219 2002
1220sub _draw { 2003sub _draw {
1221 my ($self) = @_; 2004 my ($self) = @_;
1222 2005
1236 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2019 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1237 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2020 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1238 2021
1239 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2022 my ($value, $lo, $hi, $page) = @{$self->{range}};
1240 2023
2024 $hi = $value + 1 if $lo == $hi;
2025
2026 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2027 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2028
1241 $page = int $page * $w / ($hi - $lo); 2029 $page = int $page * $inner_w / ($hi - $lo);
1242 $value = int +($value - $lo) * $w / ($hi - $lo); 2030 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1243 2031
1244 $w -= $page; 2032 $w -= $page;
1245 $page &= ~1; 2033 $page &= ~1;
1246 glTranslate $page * 0.5, 0, 0; 2034 glTranslate $page * 0.5, 0, 0;
2035 $page ||= 2;
1247 2036
1248 glColor @$fg;
1249 glBegin GL_LINES;
1250 glVertex 0, 0; glVertex 0, $h;
1251 glVertex $w - 1, 0; glVertex $w - 1, $h;
1252 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1253 glEnd;
1254
1255 my $knob_a = $value - $page * 0.5; 2037 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1256 my $knob_b = $value + $page * 0.5; 2038 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1257 2039
1258 glBegin GL_QUADS; 2040 glEnable GL_BLEND;
1259 glColor @$fg; 2041 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1260 glVertex $knob_a, 0; 2042 glEnable GL_TEXTURE_2D;
1261 glVertex $knob_a, $h; 2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1262 glVertex $knob_b, $h;
1263 glVertex $knob_b, 0;
1264 2044
1265 if ($knob_a < $knob_b - 2) { 2045 # draw background
1266 glColor @$bg; 2046 $tex[1]->draw_quad (0, 0, $w, $h);
1267 glVertex $knob_a + 1, 1;
1268 glVertex $knob_a + 1, $h - 1;
1269 glVertex $knob_b - 1, $h - 1;
1270 glVertex $knob_b - 1, 1;
1271 }
1272 glEnd;
1273}
1274 2047
1275############################################################################# 2048 # draw handle
2049 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1276 2050
2051 glDisable GL_BLEND;
2052 glDisable GL_TEXTURE_2D;
2053}
2054
2055#############################################################################
2056
1277package CFClient::UI::MapWidget; 2057package CFClient::UI::TextView;
1278 2058
1279use strict;
1280
1281use List::Util qw(min max);
1282
1283use SDL;
1284use SDL::OpenGL;
1285
1286our @ISA = CFClient::UI::Base::; 2059our @ISA = CFClient::UI::HBox::;
2060
2061use CFClient::OpenGL;
1287 2062
1288sub new { 2063sub new {
1289 my $class = shift; 2064 my $class = shift;
1290 2065
1291 $class->SUPER::new ( 2066 my $self = $class->SUPER::new (
1292 z => -1, 2067 fontsize => 1,
1293 list => (glGenLists 1), 2068 can_events => 0,
2069 #font => default_font
1294 @_ 2070 @_,
2071
2072 layout => (new CFClient::Layout),
2073 par => [],
2074 height => 0,
2075 children => [
2076 (new CFClient::UI::Empty expand => 1),
2077 (new CFClient::UI::Slider vertical => 1),
2078 ],
1295 ) 2079 );
1296}
1297 2080
1298sub key_down { 2081 $self->{children}[1]->connect (changed => sub {
1299 print "MAPKEYDOWN\n"; 2082 $self->update;
1300} 2083 });
1301 2084
1302sub key_up { 2085 $self
1303} 2086}
1304 2087
1305sub size_request { 2088sub set_fontsize {
2089 my ($self, $fontsize) = @_;
2090
2091 $self->{fontsize} = $fontsize;
2092 $self->reflow;
2093}
2094
2095sub text_height {
2096 my ($self, $text) = @_;
2097
2098 my $layout = $self->{layout};
2099
2100 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2101 $layout->set_width ($self->{w});
2102 $layout->set_text ($text);
1306 ( 2103
1307 1 + 32 * int $::WIDTH / 32, 2104 ($layout->size)[1]
1308 1 + 32 * int $::HEIGHT / 32, 2105}
1309 ) 2106
2107sub reflow {
2108 my ($self) = @_;
2109
2110 $self->{need_reflow}++;
2111 $self->update;
2112}
2113
2114sub size_allocate {
2115 my ($self, $w, $h) = @_;
2116
2117 $self->SUPER::size_allocate ($w, $h);
2118
2119 $self->{layout}->set_font ($self->{font}) if $self->{font};
2120 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2121 $self->{layout}->set_width ($self->{children}[0]{w});
2122
2123 $self->reflow;
2124}
2125
2126sub add_paragraph {
2127 my ($self, $color, $text) = @_;
2128
2129 #TODO: intelligently "reformat" paragraph
2130
2131 my $height = $self->text_height ($text);
2132
2133 $self->{height} += $height;
2134
2135 push @{$self->{par}}, [$height, $color, $text];
2136
2137 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2138 $self->{children}[1]->update;
1310} 2139}
1311 2140
1312sub update { 2141sub update {
1313 my ($self) = @_; 2142 my ($self) = @_;
1314 2143
1315 $self->{need_update} = 1;
1316 $self->SUPER::update; 2144 $self->SUPER::update;
1317}
1318 2145
1319sub draw { 2146 return unless $self->{h} > 0;
1320 my ($self) = @_;
1321 2147
2148 delete $self->{texture};
2149
2150 $ROOT->on_refresh ($self, sub {
1322 if (delete $self->{need_update}) { 2151 if (delete $self->{need_reflow}) {
1323 glNewList $self->{list}, GL_COMPILE; 2152 my $height = 0;
1324 2153
1325 my $mx = $::CONN->{mapx}; 2154 $height += $_->[0] = $self->text_height ($_->[2])
1326 my $my = $::CONN->{mapy}; 2155 for @{$self->{par}};
1327 2156
1328 my $map = $::CONN->{map}; 2157 $self->{height} = $height;
1329 2158
1330 my ($xofs, $yofs); 2159 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1331 2160
1332 my $sw = 1 + int $::WIDTH / 32; 2161 delete $self->{texture};
1333 my $sh = 1 + int $::HEIGHT / 32;
1334
1335 if ($::CONN->{mapw} > $sw) {
1336 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
1337 } else {
1338 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1339 } 2162 }
1340 2163
1341 if ($::CONN->{maph} > $sh) { 2164 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1342 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 2165 glClearColor 0, 0, 0, 1;
1343 } else { 2166 glClear GL_COLOR_BUFFER_BIT;
1344 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 2167
2168 glEnable GL_BLEND;
2169 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2170 glEnable GL_TEXTURE_2D;
2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2172
2173 my $top = int $self->{children}[1]{range}[0];
2174
2175 my $y0 = $top;
2176 my $y1 = $top + $self->{h};
2177
2178 my $y = 0;
2179
2180 my $layout = $self->{layout};
2181
2182 $layout->set_font ($self->{font}) if $self->{font};
2183
2184 for my $par (@{$self->{par}}) {
2185 my $h = $par->[0];
2186
2187 if ($y0 < $y + $h && $y < $y1) {
2188 $layout->set_text ($par->[2]);
2189
2190 glColor @{ $par->[1] };
2191 my ($W, $H) = $layout->size;
2192 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
2193 }
2194
2195 $y += $h;
2196 }
2197
2198 glDisable GL_TEXTURE_2D;
2199 glDisable GL_BLEND;
1345 } 2200 };
2201 });
2202}
1346 2203
2204sub _draw {
2205 my ($self) = @_;
2206
2207 if ($self->{texture}) {
1347 glEnable GL_TEXTURE_2D; 2208 glEnable GL_TEXTURE_2D;
1348 glEnable GL_BLEND;
1349 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1350 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1351 2210 glColor 1, 1, 1, 1;
1352 my $sw4 = ($sw + 3) & ~3; 2211 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1353 my $darkness = "\x00" x ($sw4 * $sh);
1354
1355 for my $x (0 .. $sw - 1) {
1356 my $row = $map->[$x + $xofs];
1357 for my $y (0 .. $sh - 1) {
1358
1359 my $cell = $row->[$y + $yofs]
1360 or next;
1361
1362 my $dark = $cell->[0];
1363 if ($dark < 0) {
1364 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1365 } else {
1366 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1367 }
1368
1369 for my $num (grep $_, @$cell[1,2,3]) {
1370 my $tex = $::CONN->{face}[$num]{texture} || next;
1371
1372 my ($w, $h) = @$tex{qw(w h)};
1373
1374 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1375 }
1376 }
1377 }
1378
1379# if (1) { # higher quality darkness
1380# $lighting =~ s/(.)/$1$1$1/gs;
1381# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1382#
1383# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1384#
1385# $lighting = $pb->get_pixels;
1386# $lighting =~ s/(.)../$1/gs;
1387# }
1388
1389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1390
1391 $darkness = new CFClient::Texture
1392 w => $sw4,
1393 h => $sh,
1394 data => $darkness,
1395 internalformat => GL_ALPHA,
1396 format => GL_ALPHA;
1397
1398 glColor 0.45, 0.45, 0.45, 1;
1399 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1400
1401 glDisable GL_TEXTURE_2D; 2212 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403
1404 glEndList;
1405 } 2213 }
1406 2214
1407 glCallList $self->{list}; 2215 $self->{children}[1]->draw;
1408}
1409 2216
1410my %DIR = (
1411 SDLK_KP8, [1, "north"],
1412 SDLK_KP9, [2, "northeast"],
1413 SDLK_KP6, [3, "east"],
1414 SDLK_KP3, [4, "southeast"],
1415 SDLK_KP2, [5, "south"],
1416 SDLK_KP1, [6, "southwest"],
1417 SDLK_KP4, [7, "west"],
1418 SDLK_KP7, [8, "northwest"],
1419
1420 SDLK_UP, [1, "north"],
1421 SDLK_RIGHT, [3, "east"],
1422 SDLK_DOWN, [5, "south"],
1423 SDLK_LEFT, [7, "west"],
1424);
1425
1426sub key_down {
1427 my ($self, $ev) = @_;
1428
1429 my $mod = $ev->key_mod;
1430 my $sym = $ev->key_sym;
1431
1432 if ($sym == SDLK_KP5) {
1433 $::CONN->send ("command stay fire");
1434 } elsif (exists $DIR{$sym}) {
1435 if ($mod & KMOD_SHIFT) {
1436 $self->{shft}++;
1437 $::CONN->send ("command fire $DIR{$sym}[0]");
1438 } elsif ($mod & KMOD_CTRL) {
1439 $self->{ctrl}++;
1440 $::CONN->send ("command run $DIR{$sym}[0]");
1441 } else {
1442 $::CONN->send ("command $DIR{$sym}[1]");
1443 }
1444 }
1445}
1446
1447sub key_up {
1448 my ($self, $ev) = @_;
1449
1450 my $mod = $ev->key_mod;
1451 my $sym = $ev->key_sym;
1452
1453 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1454 $::CONN->send ("command fire_stop");
1455 }
1456 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1457 $::CONN->send ("command run_stop");
1458 }
1459} 2217}
1460 2218
1461############################################################################# 2219#############################################################################
1462 2220
1463package CFClient::UI::Animator; 2221package CFClient::UI::Animator;
1464 2222
1465use SDL::OpenGL; 2223use CFClient::OpenGL;
1466 2224
1467our @ISA = CFClient::UI::Bin::; 2225our @ISA = CFClient::UI::Bin::;
1468 2226
1469sub moveto { 2227sub moveto {
1470 my ($self, $x, $y) = @_; 2228 my ($self, $x, $y) = @_;
1500 glPopMatrix; 2258 glPopMatrix;
1501} 2259}
1502 2260
1503############################################################################# 2261#############################################################################
1504 2262
1505package CFClient::UI::Toplevel; 2263package CFClient::UI::Flopper;
2264
2265our @ISA = CFClient::UI::Button::;
2266
2267sub new {
2268 my $class = shift;
2269
2270 my $self = $class->SUPER::new (
2271 state => 0,
2272 connect_activate => \&toggle_flopper,
2273 @_
2274 );
2275
2276 if ($self->{state}) {
2277 $self->{state} = 0;
2278 $self->toggle_flopper;
2279 }
2280
2281 $self
2282}
2283
2284sub toggle_flopper {
2285 my ($self) = @_;
2286
2287 # TODO: use animation
2288 if ($self->{state} = !$self->{state}) {
2289 $CFClient::UI::ROOT->add ($self->{other});
2290 $self->{other}->move ($self->coord2global (0, $self->{h}));
2291 $self->emit ("open");
2292 } else {
2293 $CFClient::UI::ROOT->remove ($self->{other});
2294 $self->emit ("close");
2295 }
2296
2297 $self->emit (changed => $self->{state});
2298}
2299
2300#############################################################################
2301
2302package CFClient::UI::Tooltip;
2303
2304our @ISA = CFClient::UI::Bin::;
2305
2306use CFClient::OpenGL;
2307
2308sub new {
2309 my $class = shift;
2310
2311 $class->SUPER::new (
2312 @_,
2313 can_events => 0,
2314 )
2315}
2316
2317sub set_markup {
2318 my ($self, $text) = @_;
2319
2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2321 $self->{label}->set_markup ($text);
2322 $self->add ($self->{label});
2323}
2324
2325sub size_request {
2326 my ($self) = @_;
2327
2328 $self->child->set_max_size ($::WIDTH * 0.3);
2329
2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2331
2332 ($w + 4, $h + 4)
2333}
2334
2335sub size_allocate {
2336 my ($self, $w, $h) = @_;
2337
2338 $self->SUPER::size_allocate ($w - 4, $h - 4);
2339}
2340
2341sub _draw {
2342 my ($self) = @_;
2343
2344 glPushMatrix;
2345 glTranslate 0.375, 0.375;
2346
2347 my ($w, $h) = @$self{qw(w h)};
2348
2349 glColor 1, 0.8, 0.4;
2350 glBegin GL_QUADS;
2351 glVertex 0 , 0;
2352 glVertex 0 , $h;
2353 glVertex $w, $h;
2354 glVertex $w, 0;
2355 glEnd;
2356
2357 glColor 0, 0, 0;
2358 glBegin GL_LINE_LOOP;
2359 glVertex 0 , 0;
2360 glVertex 0 , $h;
2361 glVertex $w, $h;
2362 glVertex $w, 0;
2363 glEnd;
2364
2365 glPopMatrix;
2366
2367 glTranslate 2, 2;
2368 $self->SUPER::_draw;
2369}
2370
2371#############################################################################
2372
2373package CFClient::UI::Face;
2374
2375our @ISA = CFClient::UI::Base::;
2376
2377use CFClient::OpenGL;
2378
2379sub new {
2380 my $class = shift;
2381
2382 $class->SUPER::new (
2383 aspect => 1,
2384 @_,
2385 )
2386}
2387
2388sub size_request {
2389 (32, 8)
2390}
2391
2392sub draw {
2393 my ($self) = @_;
2394
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2396
2397 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D;
2405 glDisable GL_BLEND;
2406 }
2407}
2408
2409#############################################################################
2410
2411package CFClient::UI::Root;
1506 2412
1507our @ISA = CFClient::UI::Container::; 2413our @ISA = CFClient::UI::Container::;
2414
2415use CFClient::OpenGL;
2416
2417sub check_size {
2418 my ($self) = @_;
2419
2420 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2421}
1508 2422
1509sub size_request { 2423sub size_request {
1510 ($::WIDTH, $::HEIGHT) 2424 ($::WIDTH, $::HEIGHT)
1511} 2425}
1512 2426
1513sub size_allocate { 2427sub configure {
1514 my ($self, $x, $y, $w, $h) = @_; 2428 my ($self, $x, $y, $w, $h) = @_;
1515 2429
1516 $self->_size_allocate ($x, $y, $w, $h); 2430 $self->SUPER::configure ($x, $y, $w, $h);
1517 2431
1518 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1519 for @{$self->{children}}; 2432 for my $child (@{$self->{children}}) {
1520} 2433 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
1521 2434
1522sub translate { 2435 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2436 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2437 $child->configure ($X, $Y, $W,$H);
2438 }
2439}
2440
2441sub _topleft {
1523 my ($self, $x, $y) = @_; 2442 my ($self, $x, $y) = @_;
1524 2443
1525 ($x, $y) 2444 ($x, $y)
1526} 2445}
1527 2446
1528sub update { 2447sub update {
1529 my ($self) = @_; 2448 my ($self) = @_;
1530 2449
1531 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2450 $self->check_size;
1532 ::refresh (); 2451 ::refresh ();
1533} 2452}
1534 2453
1535sub add { 2454sub add {
1536 my ($self, $widget) = @_; 2455 my ($self, $child) = @_;
1537 2456
2457 # integerize window positions
2458 $child->{x} = int $child->{x};
2459 $child->{y} = int $child->{y};
2460
1538 $self->SUPER::add ($widget); 2461 $self->SUPER::add ($child);
2462}
1539 2463
1540 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2464sub on_refresh {
2465 my ($self, $id, $cb) = @_;
2466
2467 $self->{refresh_hook}{$id} = $cb;
1541} 2468}
1542 2469
1543sub draw { 2470sub draw {
1544 my ($self) = @_; 2471 my ($self) = @_;
1545 2472
2473 while (my $rcb = delete $self->{refresh_hook}) {
2474 $_->() for values %$rcb;
2475 }
2476
2477 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2478 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2479 glClear GL_COLOR_BUFFER_BIT;
2480
2481 glMatrixMode GL_PROJECTION;
2482 glLoadIdentity;
2483 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2484 glMatrixMode GL_MODELVIEW;
2485 glLoadIdentity;
2486
1546 $self->_draw; 2487 $self->_draw;
1547} 2488}
1548 2489
1549############################################################################# 2490#############################################################################
1550 2491
1551package CFClient::UI; 2492package CFClient::UI;
1552 2493
2494$ROOT = new CFClient::UI::Root;
1553$TOPLEVEL = new CFClient::UI::Toplevel; 2495$TOOLTIP = new CFClient::UI::Tooltip;
1554 2496
15551 24971
1556 2498

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines