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.152 by root, Sun Apr 23 01:05:03 2006 UTC vs.
Revision 1.249 by root, Sun May 28 01:40:02 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::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
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
16sub check_tooltip { 39sub check_tooltip {
17 if (!$GRAB) { 40 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
20 43
21 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 45 $TOOLTIP->{owner} = $widget;
46
47 my $tip = $widget->{tooltip};
48
49 $tip = $tip->($widget) if CODE:: eq ref $tip;
50
23 $TOOLTIP->set_text ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $TOOLTIP->show; 52 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
26 } 62 }
27 63
28 return; 64 return;
29 } 65 }
30 } 66 }
… …
34 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
35} 71}
36 72
37# class methods for events 73# class methods for events
38sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_down => $_[0])
76 if $FOCUS;
40} 77}
41 78
42sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS;
44} 82}
45 83
46sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
47 my ($ev) = @_; 85 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 check_tooltip; 94 check_tooltip;
57 } 95 }
58 96
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 98
61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
100 if $GRAB;
62} 101}
63 102
64sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
65 my ($ev) = @_; 104 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
67 106
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 108
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 110
72 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
112 if $GRAB;
73 113
74 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 116 $grab->update if $grab;
77 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 134
95 check_tooltip; 135 check_tooltip;
96 } 136 }
97 137
98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER;
99} 140}
100 141
101# convert position array to integers 142# convert position array to integers
102sub harmonize { 143sub harmonize {
103 my ($vals) = @_; 144 my ($vals) = @_;
… …
109 $rem += $_ - $i; 150 $rem += $_ - $i;
110 $_ = $i; 151 $_ = $i;
111 } 152 }
112} 153}
113 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
183 }
184 }
185
186 reconfigure_widgets;
187}
188
114############################################################################# 189#############################################################################
115 190
116package CFClient::UI::Base; 191package CFClient::UI::Base;
117 192
118use strict; 193use strict;
… …
121 196
122sub new { 197sub new {
123 my $class = shift; 198 my $class = shift;
124 199
125 my $self = bless { 200 my $self = bless {
126 x => 0, 201 x => 0,
127 y => 0, 202 y => 0,
128 z => 0, 203 z => 0,
129 can_events => 1, 204 can_events => 1,
130 @_ 205 @_
131 }, $class; 206 }, $class;
132 207
133 for (keys %$self) { 208 for (keys %$self) {
134 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
135 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
136 } 211 }
137 } 212 }
138 213
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
139 $self 223 $self
140} 224}
141 225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234}
235
236sub destroy {
237 my ($self) = @_;
238
239 $self->hide;
240 %$self = ();
241}
242
142sub show { 243sub show {
143 my ($self) = @_; 244 my ($self) = @_;
144 245
145 return if $self->{parent}; 246 return if $self->{parent};
146 247
147 $CFClient::UI::ROOT->add ($self); 248 $CFClient::UI::ROOT->add ($self);
148} 249}
149 250
251sub center {
252 my ($self) = @_;
253
254 $CFClient::UI::ROOT->on_post_alloc (
255 "center_$self" => sub {
256 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
257 },
258 );
259
260 $self->update;
261}
262
263sub set_visible {
264 my ($self) = @_;
265
266 return if $self->{visible};
267
268 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1;
270
271 $self->emit (visibility_change => 1);
272}
273
274sub set_invisible {
275 my ($self) = @_;
276
277 return unless $self->{visible};
278
279 # broken show/hide model
280
281 delete $self->{root};
282 delete $self->{visible};
283
284 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self;
286
287 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self;
289
290 $self->focus_out;
291
292 $self->emit (visibility_change => 0);
293}
294
150sub hide { 295sub hide {
151 my ($self) = @_; 296 my ($self) = @_;
152 297
153 return unless $self->{parent}; 298 $self->set_invisible;
154 299
155 $self->{parent}->remove ($self); 300 $self->{parent}->remove ($self)
301 if $self->{parent};
156} 302}
157 303
158sub move { 304sub move {
159 my ($self, $x, $y, $z) = @_; 305 my ($self, $x, $y, $z) = @_;
160 306
… …
163 $self->{z} = $z if defined $z; 309 $self->{z} = $z if defined $z;
164 310
165 $self->update; 311 $self->update;
166} 312}
167 313
168sub needs_redraw { 314sub set_size {
169 0 315 my ($self, $w, $h) = @_;
316
317 $self->{def_w} = $w;
318 $self->{def_h} = $h;
319
320 $self->check_size;
170} 321}
171 322
172sub size_request { 323sub size_request {
173 require Carp; 324 require Carp;
174 Carp::confess "size_request is abstract"; 325 Carp::confess "size_request is abstract";
… …
194 $self->{y} = $y; 345 $self->{y} = $y;
195 $self->update; 346 $self->update;
196 } 347 }
197 348
198 if ($self->{w} != $w || $self->{h} != $h) { 349 if ($self->{w} != $w || $self->{h} != $h) {
199 $self->{w} = $w; 350 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
200 $self->{h} = $h;
201
202 $self->size_allocate ($w, $h);
203 $self->update;
204 } 351 }
205} 352}
206 353
207sub size_allocate { 354sub size_allocate {
208 # nothing to be done 355 # nothing to be done
209} 356}
210 357
211# return top left coordinates 358sub reconfigure {
212sub _topleft { 359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363}
364
365sub children {
366}
367
368sub set_max_size {
213 my ($self, $x, $y) = @_; 369 my ($self, $w, $h) = @_;
214 370
215 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 371 delete $self->{max_w}; $self->{max_w} = $w if $w;
372 delete $self->{max_h}; $self->{max_h} = $h if $h;
373}
374
375sub set_tooltip {
376 my ($self, $tooltip) = @_;
377
378 $tooltip =~ s/^\s+//;
379 $tooltip =~ s/\s+$//;
380
381 return if $self->{tooltip} eq $tooltip;
382
383 $self->{tooltip} = $tooltip;
384
385 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
386 delete $CFClient::UI::TOOLTIP->{owner};
387 CFClient::UI::check_tooltip;
388 }
216} 389}
217 390
218# translate global coordinates to local coordinate system 391# translate global coordinates to local coordinate system
219sub coord2local { 392sub coord2local {
220 my ($self, $x, $y) = @_; 393 my ($self, $x, $y) = @_;
221 394
222 my ($X, $Y) = $self->_topleft; 395 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
223 ($x - $X, $y - $Y)
224} 396}
225 397
226# translate local coordinates to global coordinate system 398# translate local coordinates to global coordinate system
227sub coord2global { 399sub coord2global {
228 my ($self, $x, $y) = @_; 400 my ($self, $x, $y) = @_;
229 401
230 my ($X, $Y) = $self->_topleft; 402 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
231 ($x + $X, $y + $Y)
232} 403}
233 404
234sub focus_in { 405sub focus_in {
235 my ($self) = @_; 406 my ($self) = @_;
236 407
237 return if $FOCUS == $self; 408 return if $FOCUS == $self;
238 return unless $self->{can_focus}; 409 return unless $self->{can_focus};
239 410
240 my $focus = $FOCUS; $FOCUS = $self; 411 my $focus = $FOCUS; $FOCUS = $self;
241 412
242 $self->emit (focus_in => $focus); 413 $self->_emit (focus_in => $focus);
243 414
244 $focus->update if $focus; 415 $focus->update if $focus;
245 $FOCUS->update; 416 $FOCUS->update;
246} 417}
247 418
… …
250 421
251 return unless $FOCUS == $self; 422 return unless $FOCUS == $self;
252 423
253 my $focus = $FOCUS; undef $FOCUS; 424 my $focus = $FOCUS; undef $FOCUS;
254 425
255 $self->emit (focus_out => $focus); 426 $self->_emit (focus_out => $focus);
256 427
257 $focus->update if $focus; #? 428 $focus->update if $focus; #?
429
430 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
431 unless $FOCUS;
258} 432}
259 433
260sub mouse_motion { } 434sub mouse_motion { }
261sub button_up { } 435sub button_up { }
262sub key_down { } 436sub key_down { }
263sub key_up { } 437sub key_up { }
264 438
265sub button_down { 439sub button_down {
266 my ($self, $ev, $x, $y) = @_; 440 my ($self, $ev, $x, $y) = @_;
267 441
268 $self->focus_in; 442 $self->focus_in;
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 470 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 471 glVertex $x , $y + $self->{h};
298 glEnd; 472 glEnd;
299 glDisable GL_BLEND; 473 glDisable GL_BLEND;
300 } 474 }
475
476 if ($ENV{PCLIENT_DEBUG}) {
477 glPushMatrix;
478 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
480 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0;
482 glVertex $self->{w} - 1, 0;
483 glVertex $self->{w} - 1, $self->{h} - 1;
484 glVertex 0 , $self->{h} - 1;
485 glEnd;
486 glPopMatrix;
487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
488 }
301} 489}
302 490
303sub _draw { 491sub _draw {
304 my ($self) = @_; 492 my ($self) = @_;
305 493
… …
320 508
321sub set_parent { 509sub set_parent {
322 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
323 511
324 Scalar::Util::weaken ($self->{parent} = $parent); 512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
516 $self->check_size;
325} 517}
326 518
327sub check_size { 519sub check_size {
328 my ($self) = @_; 520 my ($self, $forced) = @_;
329 521
330 return unless $self->{parent}; 522 $self->{force_alloc} = 1 if $forced;
331 523 $CFClient::UI::ROOT->{check_size}{$self} = $self;
332 my ($w, $h) = $self->size_request;
333
334 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w;
336 $self->{req_h} = $h;
337
338 $self->{parent}->check_size;
339 }
340} 524}
341 525
342sub update { 526sub update {
343 my ($self) = @_; 527 my ($self) = @_;
344 528
… …
350 my ($self, $signal, $cb) = @_; 534 my ($self, $signal, $cb) = @_;
351 535
352 push @{ $self->{signal_cb}{$signal} }, $cb; 536 push @{ $self->{signal_cb}{$signal} }, $cb;
353} 537}
354 538
539sub _emit {
540 my ($self, $signal, @args) = @_;
541
542 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543}
544
355sub emit { 545sub emit {
356 my ($self, $signal, @args) = @_; 546 my ($self, $signal, @args) = @_;
357 547
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 548 $self->_emit ($signal, @args)
359 $cb->($self, @args); 549 || $self->$signal (@args);
360 } 550}
551
552sub visibility_change {
553 #my ($self, $visible) = @_;
361} 554}
362 555
363sub DESTROY { 556sub DESTROY {
364 my ($self) = @_; 557 my ($self) = @_;
365 558
559 delete $WIDGET{$self+0};
366 #$self->deactivate; 560 #$self->deactivate;
367} 561}
368 562
369############################################################################# 563#############################################################################
370 564
… …
379 my $class = shift; 573 my $class = shift;
380 574
381 # range [value, low, high, page] 575 # range [value, low, high, page]
382 576
383 $class->SUPER::new ( 577 $class->SUPER::new (
384 bg => [0, 0, 0, 0.2], 578 #bg => [0, 0, 0, 0.2],
385 active_bg => [1, 1, 1, 0.5], 579 #active_bg => [1, 1, 1, 0.5],
386 @_ 580 @_
387 ) 581 )
388} 582}
389 583
390sub _draw { 584sub _draw {
391 my ($self) = @_; 585 my ($self) = @_;
392 586
587 my $color = $FOCUS == $self && $self->{active_bg}
588 ? $self->{active_bg}
589 : $self->{bg};
590
591 if ($color && (@$color < 4 || $color->[3])) {
393 my ($w, $h) = @$self{qw(w h)}; 592 my ($w, $h) = @$self{qw(w h)};
394 593
395 glEnable GL_BLEND; 594 glEnable GL_BLEND;
396 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
397 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 596 glColor @$color;
398 597
399 glBegin GL_QUADS; 598 glBegin GL_QUADS;
400 glVertex 0 , 0; 599 glVertex 0 , 0;
401 glVertex 0 , $h; 600 glVertex 0 , $h;
402 glVertex $w, $h; 601 glVertex $w, $h;
403 glVertex $w, 0; 602 glVertex $w, 0;
404 glEnd; 603 glEnd;
405 604
406 glDisable GL_BLEND; 605 glDisable GL_BLEND;
606 }
407} 607}
408 608
409############################################################################# 609#############################################################################
410 610
411package CFClient::UI::Empty; 611package CFClient::UI::Empty;
… …
432sub new { 632sub new {
433 my ($class, %arg) = @_; 633 my ($class, %arg) = @_;
434 634
435 my $children = delete $arg{children} || []; 635 my $children = delete $arg{children} || [];
436 636
437 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 637 my $self = $class->SUPER::new (
638 children => [],
639 can_events => 0,
640 %arg,
641 );
438 $self->add ($_) for @$children; 642 $self->add ($_) for @$children;
439 643
440 $self 644 $self
441} 645}
442 646
443sub add { 647sub add {
444 my ($self, $child) = @_; 648 my ($self, @widgets) = @_;
445 649
446 $child->set_parent ($self); 650 $_->set_parent ($self)
651 for @widgets;
447 652
448 use sort 'stable'; 653 use sort 'stable';
449 654
450 $self->{children} = [ 655 $self->{children} = [
451 sort { $a->{z} <=> $b->{z} } 656 sort { $a->{z} <=> $b->{z} }
452 @{$self->{children}}, $child 657 @{$self->{children}}, @widgets
453 ]; 658 ];
454 659
455 $child->check_size; 660 $self->check_size (1);
661 $self->update;
662}
663
664sub children {
665 @{ $_[0]{children} }
456} 666}
457 667
458sub remove { 668sub remove {
459 my ($self, $child) = @_; 669 my ($self, $child) = @_;
460 670
461 delete $child->{parent}; 671 delete $child->{parent};
672 $child->hide;
462 673
463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
675
676 $self->check_size (1);
677 $self->update;
678}
679
680sub clear {
681 my ($self) = @_;
682
683 my $children = delete $self->{children};
684 $self->{children} = [];
685
686 for (@$children) {
687 delete $_->{parent};
688 $_->hide;
689 }
464 690
465 $self->check_size; 691 $self->check_size;
466 $self->update; 692 $self->update;
467} 693}
468 694
… …
546} 772}
547 773
548sub update { 774sub update {
549 my ($self) = @_; 775 my ($self) = @_;
550 776
551 # we want to do this delayed... 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 778 $self->SUPER::update;
554}
555
556sub render_chld {
557 my ($self) = @_;
558
559 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560 glClearColor 0, 0, 0, 1;
561 glClear GL_COLOR_BUFFER_BIT;
562 $self->child->draw;
563 };
564} 779}
565 780
566sub size_allocate { 781sub size_allocate {
567 my ($self, $w, $h) = @_; 782 my ($self, $w, $h) = @_;
568 783
569 $self->child->configure (0, 0, $w, $h); 784 $self->SUPER::size_allocate ($w, $h);
785 $self->update;
786}
570 787
788sub _render {
789 $_[0]{children}[0]->draw;
790}
791
792sub render_child {
793 my ($self) = @_;
794
795 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
796 glClearColor 0, 0, 0, 0;
797 glClear GL_COLOR_BUFFER_BIT;
798
571 $self->render_chld; 799 $self->_render;
800 };
572} 801}
573 802
574sub _draw { 803sub _draw {
575 my ($self) = @_; 804 my ($self) = @_;
576 805
577 my ($w, $h) = ($self->w, $self->h); 806 my ($w, $h) = ($self->w, $self->h);
578 807
579 my $tex = $self->{texture} 808 my $tex = $self->{texture}
580 or return; 809 or return;
581 810
582 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 811 glEnable GL_TEXTURE_2D;
585 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
813 glColor 1, 1, 1, 1;
586 814
587 $tex->draw_quad (0, 0, $w, $h); 815 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
588 816
589 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 817 glDisable GL_TEXTURE_2D;
591} 818}
592 819
593############################################################################# 820#############################################################################
594 821
595package CFClient::UI::ViewPort; 822package CFClient::UI::ViewPort;
596 823
597our @ISA = CFClient::UI::Window::; 824our @ISA = CFClient::UI::Window::;
598
599sub new { die }
600
601sub size_request {
602 my ($self) = @_;
603
604 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
606
607 @$self{qw(child_w child_h)}
608}
609
610sub _draw {
611 my ($self) = @_;
612
613 $self->{children}[1]->draw;
614}
615
616
617#############################################################################
618
619package CFClient::UI::Frame;
620
621our @ISA = CFClient::UI::Bin::;
622
623use CFClient::OpenGL;
624 825
625sub new { 826sub new {
626 my $class = shift; 827 my $class = shift;
627 828
628 my $self = $class->SUPER::new ( 829 $class->SUPER::new (
629 bg => [1, 1, 1, 1], 830 scroll_x => 0,
630 border_bg => [1, 1, 1, 1], 831 scroll_y => 1,
631 border => 0.8,
632 @_ 832 @_,
633 ); 833 )
634
635 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643} 834}
644 835
645sub size_request { 836sub size_request {
646 my ($self) = @_; 837 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h}) 838
839 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
840
841 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y};
843
844 ($w, $h)
648} 845}
649 846
650sub size_allocate { 847sub size_allocate {
651 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
652 $self->{w} = $w; 849
653 $self->{h} = $h; 850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
852
654 $self->child->configure (0, 0, $w, $h); 853 $self->child->configure (0, 0, $w, $h);
854 $self->update;
855}
856
857sub set_offset {
858 my ($self, $x, $y) = @_;
859
860 $self->{view_x} = int $x;
861 $self->{view_y} = int $y;
862
863 $self->update;
864}
865
866# hmm, this does not work for topleft of $self... but we should not ask for that
867sub coord2local {
868 my ($self, $x, $y) = @_;
869
870 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
871}
872
873sub coord2global {
874 my ($self, $x, $y) = @_;
875
876 $x = List::Util::min $self->{w}, $x - $self->{view_x};
877 $y = List::Util::min $self->{h}, $y - $self->{view_y};
878
879 $self->SUPER::coord2global ($x, $y)
880}
881
882sub find_widget {
883 my ($self, $x, $y) = @_;
884
885 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
886 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
887 ) {
888 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
889 } else {
890 $self->CFClient::UI::Base::find_widget ($x, $y)
891 }
892}
893
894sub _render {
895 my ($self) = @_;
896
897 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
898
899 $self->SUPER::_render;
900}
901
902#############################################################################
903
904package CFClient::UI::ScrolledWindow;
905
906our @ISA = CFClient::UI::HBox::;
907
908sub new {
909 my $class = shift;
910
911 my $self;
912
913 my $slider = new CFClient::UI::Slider
914 vertical => 1,
915 range => [0, 0, 1, 0.01], # HACK fix
916 on_changed => sub {
917 $self->{vp}->set_offset (0, $_[1]);
918 },
919 ;
920
921 $self = $class->SUPER::new (
922 vp => (new CFClient::UI::ViewPort expand => 1),
923 slider => $slider,
924 @_,
925 );
926
927 $self->{vp}->add ($self->{scrolled});
928 $self->add ($self->{vp});
929 $self->add ($self->{slider});
930
931 $self
932}
933
934sub update {
935 my ($self) = @_;
936
937 $self->SUPER::update;
938
939 # todo: overwrite size_allocate of child
940 my $child = $self->{vp}->child;
941 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
942}
943
944sub size_allocate {
945 my ($self, $w, $h) = @_;
946
947 $self->SUPER::size_allocate ($w, $h);
948
949 my $child = $self->{vp}->child;
950 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
951}
952
953#TODO# update range on size_allocate depending on child
954# update viewport offset on scroll
955
956#############################################################################
957
958package CFClient::UI::Frame;
959
960our @ISA = CFClient::UI::Bin::;
961
962use CFClient::OpenGL;
963
964sub new {
965 my $class = shift;
966
967 $class->SUPER::new (
968 bg => undef,
969 @_,
970 )
655} 971}
656 972
657sub _draw { 973sub _draw {
658 my ($self) = @_; 974 my ($self) = @_;
659 975
660 my ($w, $h) = ($self->{w}, $self->{h}); 976 if ($self->{bg}) {
977 my ($w, $h) = @$self{qw(w h)};
661 978
662 glEnable GL_BLEND; 979 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 981 glColor @{ $self->{bg} };
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
666 982
667# glBegin GL_QUADS; 983 glBegin GL_QUADS;
668# glColor 0, 0, 0, 0;
669# glVertex 0 , 0; 984 glVertex 0 , 0;
670# glVertex 0 , $h; 985 glVertex 0 , $h;
671# glVertex $w, $h; 986 glVertex $w, $h;
672# glVertex $w, 0; 987 glVertex $w, 0;
673# glEnd; 988 glEnd;
674 989
675
676 $self->child->draw;
677 glDisable GL_BLEND; 990 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D; 991 }
992
993 $self->SUPER::_draw;
679} 994}
680 995
681############################################################################# 996#############################################################################
682 997
683package CFClient::UI::FancyFrame; 998package CFClient::UI::FancyFrame;
… …
691 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1006 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
692 1007
693sub new { 1008sub new {
694 my $class = shift; 1009 my $class = shift;
695 1010
696 # TODO: user_x, user_y, overwrite moveto?
697
698 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
701 border => 0.8, 1014 border => 0.6,
1015 is_toplevel => 1,
702 can_events => 1, 1016 can_events => 1,
703 @_ 1017 @_
704 ); 1018 );
705 1019
706 $self->{title} &&= new CFClient::UI::Label 1020 $self->{title} &&= new CFClient::UI::Label
707 align => 0, 1021 align => 0,
708 valign => 1, 1022 valign => 1,
709 text => $self->{title}, 1023 text => $self->{title},
710 fontsize => 1; 1024 fontsize => $self->{border};
711 1025
712 $self 1026 $self
713} 1027}
714 1028
715sub border { 1029sub border {
716 int $_[0]{border} * $::FONTSIZE 1030 int $_[0]{border} * $::FONTSIZE
717} 1031}
718 1032
719sub size_request { 1033sub size_request {
720 my ($self) = @_; 1034 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723 1035
724 my ($w, $h) = $self->SUPER::size_request; 1036 my ($w, $h) = $self->SUPER::size_request;
725 1037
726 ( 1038 (
727 $w + $self->border * 2, 1039 $w + $self->border * 2,
… …
733 my ($self, $w, $h) = @_; 1045 my ($self, $w, $h) = @_;
734 1046
735 $h -= List::Util::max 0, $self->border * 2; 1047 $h -= List::Util::max 0, $self->border * 2;
736 $w -= List::Util::max 0, $self->border * 2; 1048 $w -= List::Util::max 0, $self->border * 2;
737 1049
738 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
739 if $self->{title}; 1051 if $self->{title};
740 1052
741 $self->child->configure ($self->border, $self->border, $w, $h); 1053 $self->child->configure ($self->border, $self->border, $w, $h);
742} 1054}
743 1055
744sub button_down { 1056sub button_down {
745 my ($self, $ev, $x, $y) = @_; 1057 my ($self, $ev, $x, $y) = @_;
746 1058
1059 my ($w, $h) = @$self{qw(w h)};
747 my $border = $self->border; 1060 my $border = $self->border;
748 1061
749 if ($x < $self->{w} && $x >= $self->{w} - $border 1062 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750 && $y < $self->{h} && $y >= $self->{h} - $border) { 1063 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751 1064
1065 if ($lr & $td) {
1066 my ($wx, $wy) = ($self->{x}, $self->{y});
752 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1067 my ($ox, $oy) = ($ev->{x}, $ev->{y});
753 my ($bw, $bh) = ($self->{w}, $self->{h}); 1068 my ($bw, $bh) = ($self->{w}, $self->{h});
754 1069
1070 my $mx = $x < $border;
1071 my $my = $y < $border;
1072
755 $self->{motion} = sub { 1073 $self->{motion} = sub {
756 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
757 1075
758 ($x, $y) = ($ev->{x}, $ev->{y}); 1076 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy;
759 1078
760 $self->{user_w} = $bw + $x - $ox; 1079 $self->{user_x} = $wx + $dx * $mx;
761 $self->{user_h} = $bh + $y - $oy; 1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y});
762 $self->check_size; 1084 $self->check_size;
763 }; 1085 };
764 1086
765 } elsif ($x >= 0 && $x < $self->{w} 1087 } elsif ($lr ^ $td) {
766 && $y >= 0 && $y < $border) {
767
768 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
769 my ($bx, $by) = ($self->{x}, $self->{y}); 1089 my ($bx, $by) = ($self->{x}, $self->{y});
770 1090
771 $self->{motion} = sub { 1091 $self->{motion} = sub {
772 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
773 1093
774 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
775 1095
776 $self->move ($bx + $x - $ox, $by + $y - $oy); 1096 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy;
1098
1099 $self->move ($self->{user_x}, $self->{user_y});
777 $self->update; 1100 $self->update;
778 }; 1101 };
779 } 1102 }
780} 1103}
781 1104
… …
795 my ($self) = @_; 1118 my ($self) = @_;
796 1119
797 my ($w, $h ) = ($self->{w}, $self->{h}); 1120 my ($w, $h ) = ($self->{w}, $self->{h});
798 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1121 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
799 1122
800 glEnable GL_BLEND;
801 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
802 glEnable GL_TEXTURE_2D; 1123 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
804 1125
805 my $border = $self->border; 1126 my $border = $self->border;
806 1127
807 glColor @{ $self->{border_bg} }; 1128 glColor @{ $self->{border_bg} };
808 $tex[1]->draw_quad (0, 0, $w, $border); 1129 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
809 $tex[3]->draw_quad (0, $border, $border, $ch); 1130 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1131 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
811 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1132 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
812 1133
1134 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
813 my $bg = $tex[0]; 1135 my $bg = $tex[0];
814 1136
815 # TODO: repeat texture not scale 1137 # TODO: repeat texture not scale
816 my $rep_x = $cw / $bg->{w}; 1138 my $rep_x = $cw / $bg->{w};
817 my $rep_y = $ch / $bg->{h}; 1139 my $rep_y = $ch / $bg->{h};
818 1140
819 glColor @{ $self->{bg} }; 1141 glColor @{ $self->{bg} };
820 1142
821 $bg->{s} = $rep_x; 1143 $bg->{s} = $rep_x;
822 $bg->{t} = $rep_y; 1144 $bg->{t} = $rep_y;
823 $bg->{wrap_mode} = 1; 1145 $bg->{wrap_mode} = 1;
824 $bg->draw_quad ($border, $border, $cw, $ch); 1146 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147 }
825 1148
826 glDisable GL_TEXTURE_2D; 1149 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND;
828 1150
829 $self->{title}->draw if $self->{title}; 1151 $self->{title}->draw if $self->{title};
1152
830 $self->child->draw; 1153 $self->child->draw;
831} 1154}
832 1155
833############################################################################# 1156#############################################################################
834 1157
… …
843sub new { 1166sub new {
844 my $class = shift; 1167 my $class = shift;
845 1168
846 $class->SUPER::new ( 1169 $class->SUPER::new (
847 col_expand => [], 1170 col_expand => [],
848 @_ 1171 @_,
849 ) 1172 )
1173}
1174
1175sub children {
1176 grep $_, map @$_, grep $_, @{ $_[0]{children} }
850} 1177}
851 1178
852sub add { 1179sub add {
853 my ($self, $x, $y, $child) = @_; 1180 my ($self, $x, $y, $child) = @_;
854 1181
855 $child->set_parent ($self); 1182 $child->set_parent ($self);
856 $self->{children}[$y][$x] = $child; 1183 $self->{children}[$y][$x] = $child;
857 1184
858 $child->check_size; 1185 $self->check_size (1);
859} 1186}
860 1187
861# TODO: move to container class maybe? send childs a signal on removal? 1188# TODO: move to container class maybe? send children a signal on removal?
862sub clear { 1189sub clear {
863 my ($self) = @_; 1190 my ($self) = @_;
864 1191
1192 my @children = $self->children;
865 delete $self->{children}; 1193 delete $self->{children};
1194
1195 for (@children) {
1196 delete $_->{parent};
1197 $_->hide;
1198 }
1199
1200 $self->check_size (1);
866 $self->update; 1201 $self->update;
867} 1202}
868 1203
869sub get_wh { 1204sub get_wh {
870 my ($self) = @_; 1205 my ($self) = @_;
… …
902sub size_allocate { 1237sub size_allocate {
903 my ($self, $w, $h) = @_; 1238 my ($self, $w, $h) = @_;
904 1239
905 my ($ws, $hs) = $self->get_wh; 1240 my ($ws, $hs) = $self->get_wh;
906 1241
907 my $req_w = sum @$ws; 1242 my $req_w = (sum @$ws) || 1;
908 my $req_h = sum @$hs; 1243 my $req_h = (sum @$hs) || 1;
909 1244
910 # TODO: nicer code && do row_expand 1245 # TODO: nicer code && do row_expand
911 my @col_expand = @{$self->{col_expand}}; 1246 my @col_expand = @{$self->{col_expand}};
912 @col_expand = (1) x @$ws unless @col_expand; 1247 @col_expand = (1) x @$ws unless @col_expand;
913 my $col_expand = (sum @col_expand) || 1; 1248 my $col_expand = (sum @col_expand) || 1;
… …
967 } 1302 }
968} 1303}
969 1304
970############################################################################# 1305#############################################################################
971 1306
972package CFClient::UI::HBox; 1307package CFClient::UI::Box;
973
974# TODO: wrap into common Box base class
975 1308
976our @ISA = CFClient::UI::Container::; 1309our @ISA = CFClient::UI::Container::;
977 1310
978sub size_request { 1311sub size_request {
979 my ($self) = @_; 1312 my ($self) = @_;
980 1313
981 my @alloc = map [$_->size_request], @{$self->{children}}; 1314 $self->{vertical}
982 1315 ? (
983 ( 1316 (List::Util::max map $_->{req_w}, @{$self->{children}}),
984 (List::Util::sum map $_->[0], @alloc), 1317 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
985 (List::Util::max map $_->[1], @alloc), 1318 )
986 ) 1319 : (
1320 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1321 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1322 )
987} 1323}
988 1324
989sub size_allocate { 1325sub size_allocate {
990 my ($self, $w, $h) = @_; 1326 my ($self, $w, $h) = @_;
991 1327
992 ($h, $w) = ($w, $h); 1328 my $space = $self->{vertical} ? $h : $w;
993
994 my $children = $self->{children}; 1329 my $children = $self->{children};
995 1330
996 my @h = map $_->{req_w}, @$children; 1331 my @req;
997 1332
998 my $req_h = List::Util::sum @h; 1333 if ($self->{homogeneous}) {
999 1334 @req = ($space / (@$children || 1)) x @$children;
1000 if ($req_h > $h) {
1001 # ah well, not enough space
1002 $_ *= $h / $req_h for @h;
1003 } else { 1335 } else {
1336 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1337 my $req = List::Util::sum @req;
1338
1339 if ($req > $space) {
1340 # ah well, not enough space
1341 $_ *= $space / $req for @req;
1342 } else {
1004 my $exp = List::Util::sum map $_->{expand}, @$children; 1343 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1005 $exp ||= 1;
1006 1344
1345 $space = ($space - $req) / $expand; # remaining space to give away
1346
1347 $req[$_] += $space * $children->[$_]{expand}
1007 for (0 .. $#$children) { 1348 for 0 .. $#$children;
1008 my $child = $children->[$_];
1009
1010 my $alloc_h = $h[$_];
1011 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1012 $h[$_] = $alloc_h;
1013 } 1349 }
1014 } 1350 }
1015 1351
1016 CFClient::UI::harmonize \@h; 1352 CFClient::UI::harmonize \@req;
1017 1353
1018 my $y = 0; 1354 my $pos = 0;
1019 for (0 .. $#$children) { 1355 for (0 .. $#$children) {
1020 my $child = $children->[$_];
1021 my $h = $h[$_]; 1356 my $alloc = $req[$_];
1022 $child->configure ($y, 0, $h, $w); 1357 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1023 1358
1024 $y += $h; 1359 $pos += $alloc;
1025 } 1360 }
1026 1361
1027 1 1362 1
1028} 1363}
1029 1364
1030############################################################################# 1365#############################################################################
1031 1366
1367package CFClient::UI::HBox;
1368
1369our @ISA = CFClient::UI::Box::;
1370
1371sub new {
1372 my $class = shift;
1373
1374 $class->SUPER::new (
1375 vertical => 0,
1376 @_,
1377 )
1378}
1379
1380#############################################################################
1381
1032package CFClient::UI::VBox; 1382package CFClient::UI::VBox;
1033 1383
1034# TODO: wrap into common Box base class
1035
1036our @ISA = CFClient::UI::Container::; 1384our @ISA = CFClient::UI::Box::;
1037 1385
1038sub size_request { 1386sub new {
1039 my ($self) = @_; 1387 my $class = shift;
1040 1388
1041 my @alloc = map [$_->size_request], @{$self->{children}}; 1389 $class->SUPER::new (
1042 1390 vertical => 1,
1043 ( 1391 @_,
1044 (List::Util::max map $_->[0], @alloc),
1045 (List::Util::sum map $_->[1], @alloc),
1046 ) 1392 )
1047} 1393}
1048 1394
1049sub size_allocate {
1050 my ($self, $w, $h) = @_;
1051
1052 my $children = $self->{children};
1053
1054 my @h = map $_->{req_h}, @$children;
1055
1056 my $req_h = List::Util::sum @h;
1057
1058 if ($req_h > $h) {
1059 # ah well, not enough space
1060 $_ *= $h / $req_h for @h;
1061 } else {
1062 my $exp = List::Util::sum map $_->{expand}, @$children;
1063 $exp ||= 1;
1064
1065 for (0 .. $#$children) {
1066 my $child = $children->[$_];
1067
1068 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1069 }
1070 }
1071
1072 CFClient::UI::harmonize \@h;
1073
1074 my $y = 0;
1075 for (0 .. $#$children) {
1076 my $child = $children->[$_];
1077 my $h = $h[$_];
1078 $child->configure (0, $y, $w, $h);
1079
1080 $y += $h;
1081 }
1082
1083 1
1084}
1085
1086############################################################################# 1395#############################################################################
1087 1396
1088package CFClient::UI::Label; 1397package CFClient::UI::Label;
1089 1398
1090our @ISA = CFClient::UI::Base::; 1399our @ISA = CFClient::UI::DrawBG::;
1091 1400
1092use CFClient::OpenGL; 1401use CFClient::OpenGL;
1093 1402
1094sub new { 1403sub new {
1095 my ($class, %arg) = @_; 1404 my ($class, %arg) = @_;
1096 1405
1097 my $self = $class->SUPER::new ( 1406 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1407 fg => [1, 1, 1],
1408 #bg => none
1409 #active_bg => none
1410 #font => default_font
1411 #text => initial text
1412 #markup => initial narkup
1413 #max_w => maximum pixel width
1414 ellipsise => 3, # end
1415 layout => (new CFClient::Layout),
1099 fontsize => 1, 1416 fontsize => 1,
1100 text => "",
1101 align => -1, 1417 align => -1,
1102 valign => -1, 1418 valign => -1,
1103 padding => 2, 1419 padding => 2,
1104 layout => new CFClient::Layout,
1105 can_events => 0, 1420 can_events => 0,
1106 %arg 1421 %arg
1107 ); 1422 );
1108 1423
1109 if (exists $self->{template}) { 1424 if (exists $self->{template}) {
1110 my $layout = new CFClient::Layout; 1425 my $layout = new CFClient::Layout;
1111 $layout->set_text (delete $self->{template}); 1426 $layout->set_text (delete $self->{template});
1112 $self->{template} = $layout; 1427 $self->{template} = $layout;
1113 } 1428 }
1114 1429
1115 $self->set_text (delete $self->{text}) if exists $self->{text}; 1430 if (exists $self->{markup}) {
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1431 $self->set_markup (delete $self->{markup});
1432 } else {
1433 $self->set_text (delete $self->{text});
1434 }
1117 1435
1118 $self 1436 $self
1119} 1437}
1120 1438
1121sub escape_text { 1439sub escape($) {
1122 local $_ = $_[1]; 1440 local $_ = $_[0];
1123 1441
1124 s/&/&amp;/g; 1442 s/&/&amp;/g;
1125 s/>/&gt;/g; 1443 s/>/&gt;/g;
1126 s/</&lt;/g; 1444 s/</&lt;/g;
1127 1445
1128 $_[1] 1446 $_
1447}
1448
1449sub update {
1450 my ($self) = @_;
1451
1452 delete $self->{texture};
1453 $self->SUPER::update;
1129} 1454}
1130 1455
1131sub set_text { 1456sub set_text {
1132 my ($self, $text) = @_; 1457 my ($self, $text) = @_;
1133 1458
1459 return if $self->{text} eq "T$text";
1460 $self->{text} = "T$text";
1461
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1134 $self->{layout}->set_text ($text); 1463 $self->{layout}->set_text ($text);
1135 1464
1136 delete $self->{texture}; 1465 $self->update;
1137 $self->check_size; 1466 $self->check_size;
1138 $self->update;
1139} 1467}
1140 1468
1141sub set_markup { 1469sub set_markup {
1142 my ($self, $markup) = @_; 1470 my ($self, $markup) = @_;
1143 1471
1472 return if $self->{text} eq "M$markup";
1473 $self->{text} = "M$markup";
1474
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476
1477 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1144 $self->{layout}->set_markup ($markup); 1478 $self->{layout}->set_markup ($markup);
1145 1479
1146 delete $self->{texture}; 1480 $self->update;
1147 $self->check_size; 1481 $self->check_size;
1148 $self->update;
1149} 1482}
1150 1483
1151sub size_request { 1484sub size_request {
1152 my ($self) = @_; 1485 my ($self) = @_;
1153 1486
1154 $self->{layout}->set_width; 1487 $self->{layout}->set_font ($self->{font}) if $self->{font};
1488 $self->{layout}->set_width ($self->{max_w} || -1);
1489 $self->{layout}->set_ellipsise ($self->{ellipsise});
1490 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1491 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1492
1157 my ($w, $h) = $self->{layout}->size; 1493 my ($w, $h) = $self->{layout}->size;
1158 1494
1159 if (exists $self->{template}) { 1495 if (exists $self->{template}) {
1496 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1497 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1498
1162 my ($w2, $h2) = $self->{template}->size; 1499 my ($w2, $h2) = $self->{template}->size;
1163 1500
1164 $w = List::Util::max $w, $w2; 1501 $w = List::Util::max $w, $w2;
… …
1180sub set_fontsize { 1517sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1518 my ($self, $fontsize) = @_;
1182 1519
1183 $self->{fontsize} = $fontsize; 1520 $self->{fontsize} = $fontsize;
1184 delete $self->{texture}; 1521 delete $self->{texture};
1522
1523 $self->update;
1185 $self->check_size; 1524 $self->check_size;
1186 $self->update;
1187} 1525}
1188 1526
1189sub _draw { 1527sub _draw {
1190 my ($self) = @_; 1528 my ($self) = @_;
1191 1529
1530 $self->SUPER::_draw; # draw background, if applicable
1531
1192 my $tex = $self->{texture} ||= do { 1532 my $tex = $self->{texture} ||= do {
1533 $self->{layout}->set_foreground (@{$self->{fg}});
1534 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $self->{layout}->set_width ($self->{w}); 1535 $self->{layout}->set_width ($self->{w});
1536 $self->{layout}->set_ellipsise ($self->{ellipsise});
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1194 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539
1195 new_from_layout CFClient::Texture $self->{layout} 1540 my $tex = new_from_layout CFClient::Texture $self->{layout};
1541
1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1544 : ($self->{w} - $tex->{w}) * 0.5);
1545
1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1548 : ($self->{h} - $tex->{h}) * 0.5);
1549
1550 $tex
1196 }; 1551 };
1197 1552
1198 glEnable GL_BLEND;
1199 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1200 glEnable GL_TEXTURE_2D; 1553 glEnable GL_TEXTURE_2D;
1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1202 1555
1556 if ($tex->{format} == GL_ALPHA) {
1203 glColor @{$self->{fg}}; 1557 glColor @{$self->{fg}};
1204
1205 $self->{ox} = int (
1206 $self->{align} < 0 ? $self->{padding}
1207 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1208 : ($self->{w} - $tex->{w}) * 0.5
1209 );
1210
1211 $self->{oy} = int (
1212 $self->{valign} < 0 ? $self->{padding}
1213 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1214 : ($self->{h} - $tex->{h}) * 0.5
1215 );
1216
1217 $tex->draw_quad ($self->{ox}, $self->{oy}); 1558 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1559 } else {
1560 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1561 }
1218 1562
1219 glDisable GL_TEXTURE_2D; 1563 glDisable GL_TEXTURE_2D;
1220 glDisable GL_BLEND;
1221} 1564}
1222 1565
1223############################################################################# 1566#############################################################################
1224 1567
1225package CFClient::UI::EntryBase; 1568package CFClient::UI::EntryBase;
… …
1230 1573
1231sub new { 1574sub new {
1232 my $class = shift; 1575 my $class = shift;
1233 1576
1234 $class->SUPER::new ( 1577 $class->SUPER::new (
1235 fg => [1, 1, 1], 1578 fg => [1, 1, 1],
1236 bg => [0, 0, 0, 0.2], 1579 bg => [0, 0, 0, 0.2],
1237 active_bg => [1, 1, 1, 0.5], 1580 active_bg => [1, 1, 1, 0.5],
1238 active_fg => [0, 0, 0], 1581 active_fg => [0, 0, 0],
1239 can_hover => 1, 1582 can_hover => 1,
1240 can_focus => 1, 1583 can_focus => 1,
1241 valign => 0, 1584 valign => 0,
1242 can_events => 1, 1585 can_events => 1,
1586 #text => ...
1243 @_ 1587 @_
1244 ) 1588 )
1245} 1589}
1246 1590
1247sub _set_text { 1591sub _set_text {
… …
1257 $self->{text} = $text; 1601 $self->{text} = $text;
1258 1602
1259 $text =~ s/./*/g if $self->{hidden}; 1603 $text =~ s/./*/g if $self->{hidden};
1260 $self->{layout}->set_text ("$text "); 1604 $self->{layout}->set_text ("$text ");
1261 1605
1262 $self->emit (changed => $self->{text}); 1606 $self->_emit (changed => $self->{text});
1263}
1264
1265sub get_text {
1266 $_[0]{text}
1267}
1268
1269sub size_request {
1270 my ($self) = @_;
1271
1272 my ($w, $h) = $self->SUPER::size_request;
1273
1274 ($w + 1, $h) # add 1 for cursor
1275}
1276
1277sub size_allocate {
1278 my ($self, $w, $h) = @_;
1279
1280 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1281} 1607}
1282 1608
1283sub set_text { 1609sub set_text {
1284 my ($self, $text) = @_; 1610 my ($self, $text) = @_;
1285 1611
1286 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1287 $self->_set_text ($text); 1613 $self->_set_text ($text);
1288 $self->update; 1614 $self->update;
1615 $self->check_size;
1616}
1617
1618sub get_text {
1619 $_[0]{text}
1620}
1621
1622sub size_request {
1623 my ($self) = @_;
1624
1625 my ($w, $h) = $self->SUPER::size_request;
1626
1627 ($w + 1, $h) # add 1 for cursor
1289} 1628}
1290 1629
1291sub key_down { 1630sub key_down {
1292 my ($self, $ev) = @_; 1631 my ($self, $ev) = @_;
1293 1632
… …
1295 my $sym = $ev->{sym}; 1634 my $sym = $ev->{sym};
1296 my $uni = $ev->{unicode}; 1635 my $uni = $ev->{unicode};
1297 1636
1298 my $text = $self->get_text; 1637 my $text = $self->get_text;
1299 1638
1300 if ($sym == 8) { 1639 if ($uni == 8) {
1301 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1640 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1302 } elsif ($sym == 127) { 1641 } elsif ($uni == 127) {
1303 substr $text, $self->{cursor}, 1, ""; 1642 substr $text, $self->{cursor}, 1, "";
1304 } elsif ($sym == CFClient::SDLK_LEFT) { 1643 } elsif ($sym == CFClient::SDLK_LEFT) {
1305 --$self->{cursor} if $self->{cursor}; 1644 --$self->{cursor} if $self->{cursor};
1306 } elsif ($sym == CFClient::SDLK_RIGHT) { 1645 } elsif ($sym == CFClient::SDLK_RIGHT) {
1307 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1646 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1308 } elsif ($sym == CFClient::SDLK_HOME) { 1647 } elsif ($sym == CFClient::SDLK_HOME) {
1309 $self->{cursor} = 0; 1648 $self->{cursor} = 0;
1310 } elsif ($sym == CFClient::SDLK_END) { 1649 } elsif ($sym == CFClient::SDLK_END) {
1311 $self->{cursor} = length $text; 1650 $self->{cursor} = length $text;
1312 } elsif ($sym == 27) { 1651 } elsif ($uni == 27) {
1313 $self->emit ('escape'); 1652 $self->_emit ('escape');
1314 } elsif ($uni) { 1653 } elsif ($uni) {
1315 substr $text, $self->{cursor}++, 0, chr $uni; 1654 substr $text, $self->{cursor}++, 0, chr $uni;
1316 } 1655 }
1317 1656
1318 $self->_set_text ($text); 1657 $self->_set_text ($text);
1319 $self->update; 1658 $self->update;
1659 $self->check_size;
1320} 1660}
1321 1661
1322sub focus_in { 1662sub focus_in {
1323 my ($self) = @_; 1663 my ($self) = @_;
1324 1664
… …
1400 my ($self, $ev) = @_; 1740 my ($self, $ev) = @_;
1401 1741
1402 my $sym = $ev->{sym}; 1742 my $sym = $ev->{sym};
1403 1743
1404 if ($sym == 13) { 1744 if ($sym == 13) {
1745 unshift @{$self->{history}},
1746 my $txt = $self->get_text;
1747 $self->{history_pointer} = -1;
1748 $self->{history_saveback} = '';
1405 $self->emit (activate => $self->get_text); 1749 $self->_emit (activate => $txt);
1406 $self->update; 1750 $self->update;
1751
1752 } elsif ($sym == CFClient::SDLK_UP) {
1753 if ($self->{history_pointer} < 0) {
1754 $self->{history_saveback} = $self->get_text;
1755 }
1756 if (@{$self->{history} || []} > 0) {
1757 $self->{history_pointer}++;
1758 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1759 $self->{history_pointer} = @{$self->{history} || []} - 1;
1760 }
1761 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1762 }
1763
1764 } elsif ($sym == CFClient::SDLK_DOWN) {
1765 $self->{history_pointer}--;
1766 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1767
1768 if ($self->{history_pointer} >= 0) {
1769 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1770 } else {
1771 $self->set_text ($self->{history_saveback});
1772 }
1407 1773
1408 } else { 1774 } else {
1409 $self->SUPER::key_down ($ev); 1775 $self->SUPER::key_down ($ev);
1410 } 1776 }
1411 1777
… …
1425 1791
1426sub new { 1792sub new {
1427 my $class = shift; 1793 my $class = shift;
1428 1794
1429 $class->SUPER::new ( 1795 $class->SUPER::new (
1430 padding => 4, 1796 padding => 4,
1431 fg => [1, 1, 1], 1797 fg => [1, 1, 1],
1432 bg => [1, 1, 1, 0.2],
1433 active_fg => [0, 0, 1], 1798 active_fg => [0, 0, 1],
1434 can_hover => 1, 1799 can_hover => 1,
1435 align => 0, 1800 align => 0,
1436 valign => 0, 1801 valign => 0,
1437 can_events => 1, 1802 can_events => 1,
1438 @_ 1803 @_
1439 ) 1804 )
1440} 1805}
1441 1806
1807sub activate { }
1808
1442sub button_up { 1809sub button_up {
1443 my ($self, $ev, $x, $y) = @_; 1810 my ($self, $ev, $x, $y) = @_;
1444 1811
1812 $self->emit ("activate")
1445 if ($x >= 0 && $x < $self->{w} 1813 if $x >= 0 && $x < $self->{w}
1446 && $y >= 0 && $y < $self->{h}) { 1814 && $y >= 0 && $y < $self->{h};
1447 $self->emit ("activate");
1448 }
1449} 1815}
1450 1816
1451sub _draw { 1817sub _draw {
1452 my ($self) = @_; 1818 my ($self) = @_;
1453 1819
… …
1455 1821
1456 if ($GRAB == $self) { 1822 if ($GRAB == $self) {
1457 $self->{fg} = $self->{active_fg}; 1823 $self->{fg} = $self->{active_fg};
1458 } 1824 }
1459 1825
1460 glEnable GL_BLEND;
1461 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1462 glEnable GL_TEXTURE_2D; 1826 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1827 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 glColor 0, 0, 0, 1; 1828 glColor 0, 0, 0, 1;
1465 1829
1466 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1830 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1467 1831
1468 glDisable GL_TEXTURE_2D; 1832 glDisable GL_TEXTURE_2D;
1469 glDisable GL_BLEND;
1470 1833
1471 $self->SUPER::_draw; 1834 $self->SUPER::_draw;
1472} 1835}
1473 1836
1474############################################################################# 1837#############################################################################
… …
1488 1851
1489 $class->SUPER::new ( 1852 $class->SUPER::new (
1490 padding => 2, 1853 padding => 2,
1491 fg => [1, 1, 1], 1854 fg => [1, 1, 1],
1492 active_fg => [1, 1, 0], 1855 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5],
1493 state => 0, 1858 state => 0,
1494 can_hover => 1, 1859 can_hover => 1,
1495 @_ 1860 @_
1496 ) 1861 )
1497} 1862}
… …
1506 my ($self, $ev, $x, $y) = @_; 1871 my ($self, $ev, $x, $y) = @_;
1507 1872
1508 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1509 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1510 $self->{state} = !$self->{state}; 1875 $self->{state} = !$self->{state};
1511 $self->emit (changed => $self->{state}); 1876 $self->_emit (changed => $self->{state});
1512 } 1877 }
1513} 1878}
1514 1879
1515sub _draw { 1880sub _draw {
1516 my ($self) = @_; 1881 my ($self) = @_;
… …
1521 1886
1522 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1887 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1523 1888
1524 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1525 1890
1526 glEnable GL_BLEND; 1891 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892
1527 glEnable GL_TEXTURE_2D; 1893 glEnable GL_TEXTURE_2D;
1528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1529
1530 my $tex = $self->{state} ? $tex[1] : $tex[0];
1531
1532 $tex->draw_quad (0, 0, $s, $s); 1894 $tex->draw_quad_alpha (0, 0, $s, $s);
1533
1534 glDisable GL_TEXTURE_2D; 1895 glDisable GL_TEXTURE_2D;
1535 glDisable GL_BLEND;
1536} 1896}
1537 1897
1538############################################################################# 1898#############################################################################
1539 1899
1540package CFClient::UI::Image; 1900package CFClient::UI::Image;
… …
1583 glTranslate 0, -$self->{w}, 0; 1943 glTranslate 0, -$self->{w}, 0;
1584 1944
1585 ($w, $h) = ($h, $w); 1945 ($w, $h) = ($h, $w);
1586 } 1946 }
1587 1947
1588 glEnable GL_BLEND;
1589 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590 glEnable GL_TEXTURE_2D; 1948 glEnable GL_TEXTURE_2D;
1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1949 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1592 1950
1593 $tex->draw_quad (0, 0, $w, $h); 1951 $tex->draw_quad_alpha (0, 0, $w, $h);
1594 1952
1595 glDisable GL_BLEND;
1596 glDisable GL_TEXTURE_2D; 1953 glDisable GL_TEXTURE_2D;
1597} 1954}
1598 1955
1599############################################################################# 1956#############################################################################
1600 1957
1601package CFClient::UI::VGauge; 1958package CFClient::UI::VGauge;
1602 1959
1603our @ISA = CFClient::UI::Base::; 1960our @ISA = CFClient::UI::Base::;
1961
1962use List::Util qw(min max);
1604 1963
1605use CFClient::OpenGL; 1964use CFClient::OpenGL;
1606 1965
1607my %tex = ( 1966my %tex = (
1608 food => [ 1967 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1968 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1969 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ], 1970 ],
1612 grace => [ 1971 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1972 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1973 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1615 ], 1974 ],
1616 hp => [ 1975 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1976 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1977 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ], 1978 ],
1620 mana => [ 1979 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1981 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1623 ], 1982 ],
1624); 1983);
1625 1984
1626# eg. VGauge->new (gauge => 'food'), default gauge: food 1985# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new { 1986sub new {
… …
1646} 2005}
1647 2006
1648sub set_max { 2007sub set_max {
1649 my ($self, $max) = @_; 2008 my ($self, $max) = @_;
1650 2009
2010 return if $self->{max_val} == $max;
2011
1651 $self->{max_val} = $max; 2012 $self->{max_val} = $max;
2013 $self->update;
1652} 2014}
1653 2015
1654sub set_value { 2016sub set_value {
1655 my ($self, $val, $max) = @_; 2017 my ($self, $val, $max) = @_;
1656 2018
1657 $self->set_max ($max) 2019 $self->set_max ($max)
1658 if defined $max; 2020 if defined $max;
1659 2021
1660 $max = $self->{max_val}; 2022 return if $self->{val} == $val;
2023
1661 $self->{val} = $val; 2024 $self->{val} = $val;
1662
1663 $self->update; 2025 $self->update;
1664} 2026}
1665 2027
1666sub _draw { 2028sub _draw {
1667 my ($self) = @_; 2029 my ($self) = @_;
1668 2030
1669 my $tex = $tex{$self->{type}}; 2031 my $tex = $tex{$self->{type}};
2032 my ($t1, $t2, $t3) = @$tex;
1670 2033
1671 my ($w, $h) = ($self->{w}, $self->{h}); 2034 my ($w, $h) = ($self->{w}, $self->{h});
1672 2035
1673 if ($self->{vertical}) { 2036 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1; 2037 glRotate 90, 0, 0, 1;
… …
1676 2039
1677 ($w, $h) = ($h, $w); 2040 ($w, $h) = ($h, $w);
1678 } 2041 }
1679 2042
1680 my $ycut = $self->{val} / ($self->{max_val} || 1); 2043 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682 2044
1683 my $t1 = $tex->[0]; 2045 my $ycut1 = max 0, min 1, $ycut;
1684 my $t2 = $tex->[1]; 2046 my $ycut2 = max 0, min 1, $ycut - 1;
2047
2048 my $h1 = $self->{h} * (1 - $ycut1);
2049 my $h2 = $self->{h} * (1 - $ycut2);
1685 2050
1686 glEnable GL_BLEND; 2051 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2052 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D; 2053 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690 2055
1691 my $h1 = $self->{h} - $ycut * $self->{h};
1692 my $h2 = $ycut * $self->{h};
1693
1694 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2056 glBindTexture GL_TEXTURE_2D, $t1->{name};
1695 glBegin GL_QUADS; 2057 glBegin GL_QUADS;
1696 glTexCoord 0 , 0; glVertex 0 , 0; 2058 glTexCoord 0 , 0; glVertex 0 , 0;
1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2059 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2060 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1699 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2061 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1700 glEnd; 2062 glEnd;
1701 2063
2064 my $ycut1 = List::Util::min 1, $ycut;
1702 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2065 glBindTexture GL_TEXTURE_2D, $t2->{name};
1703 glBegin GL_QUADS; 2066 glBegin GL_QUADS;
1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2067 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2068 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2069 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2070 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1708 glEnd; 2071 glEnd;
2072
2073 if ($t3) {
2074 glBindTexture GL_TEXTURE_2D, $t3->{name};
2075 glBegin GL_QUADS;
2076 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2077 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2078 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2079 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2080 glEnd;
2081 }
1709 2082
1710 glDisable GL_BLEND; 2083 glDisable GL_BLEND;
1711 glDisable GL_TEXTURE_2D; 2084 glDisable GL_TEXTURE_2D;
1712} 2085}
1713 2086
… …
1719 2092
1720sub new { 2093sub new {
1721 my ($class, %arg) = @_; 2094 my ($class, %arg) = @_;
1722 2095
1723 my $self = $class->SUPER::new ( 2096 my $self = $class->SUPER::new (
1724 tooltip => $arg{type}, 2097 tooltip => $arg{type},
2098 can_hover => 1,
2099 can_events => 1,
1725 %arg, 2100 %arg,
1726 ); 2101 );
1727 2102
1728 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2103 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1729 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2104 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1730 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2105 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1731 2106
1732 $self 2107 $self
1733} 2108}
1734 2109
… …
1737 2112
1738 $self->{value}->set_fontsize ($fsize); 2113 $self->{value}->set_fontsize ($fsize);
1739 $self->{max} ->set_fontsize ($fsize); 2114 $self->{max} ->set_fontsize ($fsize);
1740} 2115}
1741 2116
2117sub set_max {
2118 my ($self, $max) = @_;
2119
2120 $self->{gauge}->set_max ($max);
2121 $self->{max}->set_text ($max);
2122}
2123
1742sub set_value { 2124sub set_value {
1743 my ($self, $val, $max) = @_; 2125 my ($self, $val, $max) = @_;
1744 2126
1745 $self->set_max ($max) 2127 $self->set_max ($max)
1746 if defined $max; 2128 if defined $max;
1747 2129
1748 $self->{gauge}->set_value ($val, $max); 2130 $self->{gauge}->set_value ($val, $max);
1749 $self->{value}->set_text ($val); 2131 $self->{value}->set_text ($val);
1750}
1751
1752sub set_max {
1753 my ($self, $max) = @_;
1754
1755 $self->{gauge}->set_max ($max);
1756 $self->{max}->set_text ($max);
1757} 2132}
1758 2133
1759############################################################################# 2134#############################################################################
1760 2135
1761package CFClient::UI::Slider; 2136package CFClient::UI::Slider;
… …
1771 qw(s1_slider.png s1_slider_bg.png); 2146 qw(s1_slider.png s1_slider_bg.png);
1772 2147
1773sub new { 2148sub new {
1774 my $class = shift; 2149 my $class = shift;
1775 2150
1776 # range [value, low, high, page] 2151 # range [value, low, high, page, unit]
1777 2152
1778 # TODO: 0-width page 2153 # TODO: 0-width page
1779 # TODO: req_w/h are wrong with vertical 2154 # TODO: req_w/h are wrong with vertical
1780 # TODO: calculations are off 2155 # TODO: calculations are off
1781 my $self = $class->SUPER::new ( 2156 my $self = $class->SUPER::new (
1782 fg => [1, 1, 1], 2157 fg => [1, 1, 1],
1783 active_fg => [0, 0, 0], 2158 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5],
1784 range => [0, 0, 100, 10], 2161 range => [0, 0, 100, 10, 0],
1785 req_w => 20, 2162 req_w => $::WIDTH / 80,
1786 req_h => 20, 2163 req_h => $::WIDTH / 80,
1787 vertical => 0, 2164 vertical => 0,
1788 can_hover => 1, 2165 can_hover => 1,
1789 inner_pad => 5, 2166 inner_pad => 0.02,
1790 @_ 2167 @_
1791 ); 2168 );
1792 2169
2170 $self->set_value ($self->{range}[0]);
2171 $self->update;
2172
1793 $self 2173 $self
2174}
2175
2176sub set_range {
2177 my ($self, $range) = @_;
2178
2179 ($range, $self->{range}) = ($self->{range}, $range);
2180
2181 $self->update
2182 if "@$range" ne "@{$self->{range}}";
2183}
2184
2185sub set_value {
2186 my ($self, $value) = @_;
2187
2188 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2189
2190 $hi = $lo + 1 if $hi <= $lo;
2191
2192 $page = $hi - $lo if $page > $hi - $lo;
2193
2194 $value = $lo if $value < $lo;
2195 $value = $hi - $page if $value > $hi - $page;
2196
2197 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2198 if $unit;
2199
2200 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2201
2202 if ($value != $old_value) {
2203 $self->_emit (changed => $value);
2204 $self->update;
2205 }
1794} 2206}
1795 2207
1796sub size_request { 2208sub size_request {
1797 my ($self) = @_; 2209 my ($self) = @_;
1798 2210
… …
1804 2216
1805sub button_down { 2217sub button_down {
1806 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
1807 2219
1808 $self->SUPER::button_down ($ev, $x, $y); 2220 $self->SUPER::button_down ($ev, $x, $y);
2221
2222 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223
1809 $self->mouse_motion ($ev, $x, $y); 2224 $self->mouse_motion ($ev, $x, $y);
1810} 2225}
1811 2226
1812sub mouse_motion { 2227sub mouse_motion {
1813 my ($self, $ev, $x, $y) = @_; 2228 my ($self, $ev, $x, $y) = @_;
1814 2229
1815 if ($GRAB == $self) { 2230 if ($GRAB == $self) {
2231 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2232
2233 my (undef, $lo, $hi, $page) = @{$self->{range}};
2234
2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236
2237 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2238 }
2239}
2240
2241sub update {
2242 my ($self) = @_;
2243
2244 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2245 $self->set_value ($self->{range}[0]);
2246
1816 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2247 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100;
1817 2249
1818 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2250 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1819 2251
1820 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2252 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1821 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2253 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1822 2254
1823 $x -= $inner_pad_px; # substract the padding 2255 $value = ($value - $lo) / $range;
1824 $x = $x * ($hi - $lo) / $inner_w + $lo; 2256 $value = $value * $self->{scale} + $self->{offset};
1825 $x = $lo if $x < $lo;
1826 $x = $hi - $page if $x > $hi - $page;
1827 $self->{range}[0] = $x;
1828 2257
1829 $self->emit (changed => $x); 2258 $self->{knob_x} = $value - $knob_w * 0.5;
1830 $self->update; 2259 $self->{knob_w} = $knob_w;
1831 } 2260 });
1832}
1833 2261
1834# the inner_* stuff is for generating a padding for the slider handle, 2262 $self->SUPER::update;
1835# so that the handle doesn't leave the texture. This calculation isn't 100%
1836# correct propably, but it does the job for now
1837sub _calc_inner_pad_px {
1838 my ($self, $w) = @_;
1839 ($w / 100) * $self->{inner_pad} # % to pixels
1840} 2263}
1841 2264
1842sub _draw { 2265sub _draw {
1843 my ($self) = @_; 2266 my ($self) = @_;
1844 2267
1845 $self->SUPER::_draw (); 2268 $self->SUPER::_draw ();
1846 2269
1847 my ($w, $h) = @$self{qw(w h)}; 2270 glScale $self->{w}, $self->{h};
1848 2271
1849 if ($self->{vertical}) { 2272 if ($self->{vertical}) {
1850 # draw a vertical slider like a rotated horizontal slider 2273 # draw a vertical slider like a rotated horizontal slider
1851 2274
2275 glTranslate 1, 0, 0;
1852 glRotate 90, 0, 0, 1; 2276 glRotate 90, 0, 0, 1;
1853 glTranslate 0, -$self->{w}, 0;
1854
1855 ($w, $h) = ($h, $w);
1856 } 2277 }
1857 2278
1858 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2279 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1859 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2280 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1860 2281
1861 my ($value, $lo, $hi, $page) = @{$self->{range}};
1862
1863 $hi = $value + 1 if $lo == $hi;
1864
1865 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1866 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1867
1868 $page = int $page * $inner_w / ($hi - $lo);
1869 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1870
1871 $w -= $page;
1872 $page &= ~1;
1873 glTranslate $page * 0.5, 0, 0;
1874 $page ||= 2;
1875
1876 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1877 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1878
1879 glEnable GL_BLEND;
1880 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1881 glEnable GL_TEXTURE_2D; 2282 glEnable GL_TEXTURE_2D;
1882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1883 2284
1884 # draw background 2285 # draw background
1885 $tex[1]->draw_quad (0, 0, $w, $h); 2286 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1886 2287
1887 # draw handle 2288 # draw handle
1888 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2289 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1889 2290
1890 glDisable GL_BLEND;
1891 glDisable GL_TEXTURE_2D; 2291 glDisable GL_TEXTURE_2D;
1892} 2292}
2293
2294#############################################################################
2295
2296package CFClient::UI::ValSlider;
2297
2298our @ISA = CFClient::UI::HBox::;
2299
2300sub new {
2301 my ($class, %arg) = @_;
2302
2303 my $range = delete $arg{range};
2304
2305 my $self = $class->SUPER::new (
2306 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2307 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2308 to_value => sub { shift },
2309 from_value => sub { shift },
2310 %arg,
2311 );
2312
2313 $self->{slider}->connect (changed => sub {
2314 my ($self, $value) = @_;
2315 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2316 $self->{parent}->emit (changed => $value);
2317 });
2318
2319# $self->{entry}->connect (changed => sub {
2320# my ($self, $value) = @_;
2321# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2322# $self->{parent}->emit (changed => $value);
2323# });
2324
2325 $self->add ($self->{slider}, $self->{entry});
2326
2327 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2328
2329 $self
2330}
2331
2332sub set_range { shift->{slider}->set_range (@_) }
2333sub set_value { shift->{slider}->set_value (@_) }
1893 2334
1894############################################################################# 2335#############################################################################
1895 2336
1896package CFClient::UI::TextView; 2337package CFClient::UI::TextView;
1897 2338
… …
1901 2342
1902sub new { 2343sub new {
1903 my $class = shift; 2344 my $class = shift;
1904 2345
1905 my $self = $class->SUPER::new ( 2346 my $self = $class->SUPER::new (
1906 fontsize => 1, 2347 fontsize => 1,
2348 can_events => 0,
2349 #font => default_font
1907 @_, 2350 @_,
1908 2351
1909 layout => (new CFClient::Layout), 2352 layout => (new CFClient::Layout 1),
1910 par => [], 2353 par => [],
1911 height => 0, 2354 height => 0,
1912 children => [ 2355 children => [
1913 (new CFClient::UI::Empty expand => 1), 2356 (new CFClient::UI::Empty expand => 1),
1914 (new CFClient::UI::Slider vertical => 1), 2357 (new CFClient::UI::Slider vertical => 1),
1915 ], 2358 ],
1916 ); 2359 );
1917 2360
1918 $self->{children}[1]->connect (changed => sub { 2361 $self->{children}[1]->connect (changed => sub { $self->update });
1919 $self->update;
1920 });
1921 2362
1922 $self 2363 $self
1923} 2364}
1924 2365
1925sub set_fontsize { 2366sub set_fontsize {
… …
1927 2368
1928 $self->{fontsize} = $fontsize; 2369 $self->{fontsize} = $fontsize;
1929 $self->reflow; 2370 $self->reflow;
1930} 2371}
1931 2372
2373sub size_allocate {
2374 my ($self, $w, $h) = @_;
2375
2376 $self->SUPER::size_allocate ($w, $h);
2377
2378 $self->{layout}->set_font ($self->{font}) if $self->{font};
2379 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2380 $self->{layout}->set_width ($self->{children}[0]{w});
2381
2382 $self->reflow;
2383}
2384
1932sub text_height { 2385sub text_size {
1933 my ($self, $text) = @_; 2386 my ($self, $text, $indent) = @_;
1934 2387
1935 my $layout = $self->{layout}; 2388 my $layout = $self->{layout};
1936 2389
1937 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1938 $layout->set_width ($self->{w}); 2391 $layout->set_width ($self->{children}[0]{w} - $indent);
1939 $layout->set_text ($text); 2392 $layout->set_markup ($text);
1940 2393
1941 ($layout->size)[1] 2394 $layout->size
1942} 2395}
1943 2396
1944sub reflow { 2397sub reflow {
1945 my ($self) = @_; 2398 my ($self) = @_;
1946 2399
1947 $self->{need_reflow}++; 2400 $self->{need_reflow}++;
1948 $self->update; 2401 $self->update;
1949} 2402}
1950 2403
1951sub size_allocate { 2404sub set_offset {
2405 my ($self, $offset) = @_;
2406
2407 # todo: base offset on lines or so, not on pixels
2408 $self->{children}[1]->set_value ($offset);
2409}
2410
2411sub clear {
1952 my ($self, $w, $h) = @_; 2412 my ($self) = @_;
1953 2413
1954 $self->SUPER::size_allocate ($w, $h); 2414 $self->{par} = [];
1955 2415 $self->{height} = 0;
1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2416 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1957 $self->{layout}->set_width ($self->{children}[0]{w});
1958
1959 $self->reflow;
1960} 2417}
1961 2418
1962sub add_paragraph { 2419sub add_paragraph {
1963 my ($self, $color, $text) = @_; 2420 my ($self, $color, $text, $indent) = @_;
1964 2421
1965 #TODO: intelligently "reformat" paragraph 2422 for my $line (split /\n/, $text) {
1966 2423 my ($w, $h) = $self->text_size ($line);
1967 my $height = $self->text_height ($text);
1968
1969 $self->{height} += $height; 2424 $self->{height} += $h;
2425 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2426 }
1970 2427
1971 push @{$self->{par}}, [$height, $color, $text];
1972
1973 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2428 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1974 $self->{children}[1]->update;
1975} 2429}
1976 2430
1977sub update { 2431sub update {
1978 my ($self) = @_; 2432 my ($self) = @_;
1979 2433
… …
1981 2435
1982 return unless $self->{h} > 0; 2436 return unless $self->{h} > 0;
1983 2437
1984 delete $self->{texture}; 2438 delete $self->{texture};
1985 2439
1986 $ROOT->on_refresh ($self, sub { 2440 $ROOT->on_post_alloc ($self, sub {
2441 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2442
1987 if (delete $self->{need_reflow}) { 2443 if (delete $self->{need_reflow}) {
1988 my $height = 0; 2444 my $height = 0;
1989 2445
1990 $height += $_->[0] = $self->text_height ($_->[2]) 2446 my $layout = $self->{layout};
2447
2448 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2449
1991 for @{$self->{par}}; 2450 for (@{$self->{par}}) {
2451 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2452 $layout->set_width ($W - $_->[3]);
2453 $layout->set_markup ($_->[4]);
2454 my ($w, $h) = $layout->size;
2455 $_->[0] = $w + $_->[3];
2456 $_->[1] = $h;
2457 }
2458
2459 $height += $_->[1];
2460 }
1992 2461
1993 $self->{height} = $height; 2462 $self->{height} = $height;
1994 2463
1995 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2464 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1996 2465
1997 delete $self->{texture}; 2466 delete $self->{texture};
1998 } 2467 }
1999 2468
2000 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2469 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2001 glClearColor 0, 0, 0, 1; 2470 glClearColor 0.5, 0.5, 0.5, 0;
2002 glClear GL_COLOR_BUFFER_BIT; 2471 glClear GL_COLOR_BUFFER_BIT;
2003 2472
2473 my $top = int $self->{children}[1]{range}[0];
2474
2475 my $y0 = $top;
2476 my $y1 = $top + $H;
2477
2478 my $y = 0;
2479
2480 my $layout = $self->{layout};
2481
2482 $layout->set_font ($self->{font}) if $self->{font};
2483
2004 glEnable GL_BLEND; 2484 glEnable GL_BLEND;
2485 #TODO# not correct in windows where rgba is forced off
2005 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2486 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2006 glEnable GL_TEXTURE_2D;
2007 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2008
2009 my $top = int $self->{children}[1]{range}[0];
2010
2011 my $y0 = $top;
2012 my $y1 = $top + $self->{h};
2013
2014 my $y = 0;
2015
2016 my $layout = $self->{layout};
2017 2487
2018 for my $par (@{$self->{par}}) { 2488 for my $par (@{$self->{par}}) {
2019 my $h = $par->[0]; 2489 my $h = $par->[1];
2020 2490
2021 if ($y0 < $y + $h && $y < $y1) { 2491 if ($y0 < $y + $h && $y < $y1) {
2492 $layout->set_foreground (@{ $par->[2] });
2493 $layout->set_width ($W - $par->[3]);
2022 $layout->set_text ($par->[2]); 2494 $layout->set_markup ($par->[4]);
2023 2495
2024 glColor @{ $par->[1] }; 2496 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2025 my ($W, $H) = $layout->size; 2497
2026 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2498 glRasterPos $par->[3], $y - $y0;
2499 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2027 } 2500 }
2028 2501
2029 $y += $h; 2502 $y += $h;
2030 } 2503 }
2031 2504
2032 glDisable GL_TEXTURE_2D;
2033 glDisable GL_BLEND; 2505 glDisable GL_BLEND;
2034 }; 2506 };
2035 }); 2507 });
2036} 2508}
2037 2509
2038sub _draw { 2510sub _draw {
2039 my ($self) = @_; 2511 my ($self) = @_;
2040 2512
2041 if ($self->{texture}) {
2042 glEnable GL_TEXTURE_2D; 2513 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2515 glColor 1, 1, 1, 1;
2044 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2516 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2045 glDisable GL_TEXTURE_2D; 2517 glDisable GL_TEXTURE_2D;
2046 }
2047 2518
2048 $self->{children}[1]->draw; 2519 $self->{children}[1]->draw;
2049 2520
2050} 2521}
2051 2522
… …
2099 2570
2100sub new { 2571sub new {
2101 my $class = shift; 2572 my $class = shift;
2102 2573
2103 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2104 state => 0, 2575 state => 0,
2105 connect_activate => \&toggle_flopper, 2576 on_activate => \&toggle_flopper,
2106 can_events => 1,
2107 @_ 2577 @_
2108 ); 2578 );
2109 2579
2110 if ($self->{state}) {
2111 $self->{state} = 0;
2112 $self->toggle_flopper;
2113 }
2114
2115 $self 2580 $self
2116} 2581}
2117 2582
2118sub toggle_flopper { 2583sub toggle_flopper {
2119 my ($self) = @_; 2584 my ($self) = @_;
2120 2585
2121 # TODO: use animation 2586 $self->{other}->toggle_visibility;
2122 if ($self->{state} = !$self->{state}) { 2587}
2123 $CFClient::UI::ROOT->add ($self->{other}); 2588
2124 $self->{other}->move ($self->coord2global (0, $self->{h})); 2589#############################################################################
2590
2591package CFClient::UI::Tooltip;
2592
2593our @ISA = CFClient::UI::Bin::;
2594
2595use CFClient::OpenGL;
2596
2597sub new {
2598 my $class = shift;
2599
2600 $class->SUPER::new (
2601 @_,
2602 can_events => 0,
2603 )
2604}
2605
2606sub set_tooltip_from {
2607 my ($self, $widget) = @_;
2608
2609 $self->add (new CFClient::UI::Label
2610 markup => $widget->{tooltip},
2611 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2612 fontsize => 0.8,
2613 fg => [0, 0, 0, 1],
2614 ellipsise => 0,
2615 font => ($widget->{tooltip_font} || $::FONT_PROP),
2616 );
2617}
2618
2619sub size_request {
2620 my ($self) = @_;
2621
2622 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2623
2624 ($w + 4, $h + 4)
2625}
2626
2627sub size_allocate {
2628 my ($self, $w, $h) = @_;
2629
2630 $self->SUPER::size_allocate ($w - 4, $h - 4);
2631}
2632
2633sub _draw {
2634 my ($self) = @_;
2635
2636 glTranslate 0.375, 0.375;
2637
2638 my ($w, $h) = @$self{qw(w h)};
2639
2640 glColor 1, 0.8, 0.4;
2641 glBegin GL_QUADS;
2642 glVertex 0 , 0;
2643 glVertex 0 , $h;
2644 glVertex $w, $h;
2645 glVertex $w, 0;
2646 glEnd;
2647
2648 glColor 0, 0, 0;
2649 glBegin GL_LINE_LOOP;
2650 glVertex 0 , 0;
2651 glVertex 0 , $h;
2652 glVertex $w, $h;
2653 glVertex $w, 0;
2654 glEnd;
2655
2656 glTranslate 2 - 0.375, 2 - 0.375;
2657 $self->SUPER::_draw;
2658}
2659
2660#############################################################################
2661
2662package CFClient::UI::Face;
2663
2664our @ISA = CFClient::UI::Base::;
2665
2666use CFClient::OpenGL;
2667
2668sub new {
2669 my $class = shift;
2670
2671 my $self = $class->SUPER::new (
2672 aspect => 1,
2673 can_events => 0,
2674 @_,
2675 );
2676
2677 if ($self->{anim} && $self->{animspeed}) {
2678 Scalar::Util::weaken (my $widget = $self);
2679
2680 $self->{timer} = Event->timer (
2681 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2682 hard => 1,
2683 interval => $self->{animspeed},
2684 cb => sub {
2685 ++$widget->{frame};
2686 $widget->update;
2687 },
2688 );
2689 }
2690
2691 $self
2692}
2693
2694sub size_request {
2695 (32, 8)
2696}
2697
2698sub update {
2699 my ($self) = @_;
2700
2701 return unless $self->{visible};
2702
2703 $self->SUPER::update;
2704}
2705
2706sub _draw {
2707 my ($self) = @_;
2708
2709 return unless $::CONN;
2710
2711 my $face;
2712
2713 if ($self->{frame}) {
2714 my $anim = $::CONN->{anim}[$self->{anim}];
2715
2716 $face = $anim->[ $self->{frame} % @$anim ]
2717 if $anim && @$anim;
2718 }
2719
2720 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2721
2722 if ($tex) {
2723 glEnable GL_TEXTURE_2D;
2724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2725 glColor 1, 1, 1, 1;
2726 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2727 glDisable GL_TEXTURE_2D;
2728 }
2729}
2730
2731sub DESTROY {
2732 my ($self) = @_;
2733
2734 $self->{timer}->cancel
2735 if $self->{timer};
2736
2737 $self->SUPER::DESTROY;
2738}
2739
2740#############################################################################
2741
2742package CFClient::UI::Inventory;
2743
2744our @ISA = CFClient::UI::ScrolledWindow::;
2745
2746sub new {
2747 my $class = shift;
2748
2749 my $self = $class->SUPER::new (
2750 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2751 @_,
2752 );
2753
2754 $self
2755}
2756
2757sub set_items {
2758 my ($self, $items) = @_;
2759
2760 $self->{scrolled}->clear;
2761 return unless $items;
2762
2763 my @items = sort {
2764 ($a->{type} <=> $b->{type})
2765 or ($a->{name} cmp $b->{name})
2766 } @$items;
2767
2768 $self->{real_items} = \@items;
2769
2770 my $row = 0;
2771 for my $item (@items) {
2772 CFClient::Item::update_widgets $item;
2773
2774 $self->{scrolled}->add (0, $row, $item->{face_widget});
2775 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2776 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2777
2778 $row++;
2779 }
2780}
2781
2782#############################################################################
2783
2784package CFClient::UI::Menu;
2785
2786our @ISA = CFClient::UI::FancyFrame::;
2787
2788use CFClient::OpenGL;
2789
2790sub new {
2791 my $class = shift;
2792
2793 my $self = $class->SUPER::new (
2794 items => [],
2795 z => 100,
2796 @_,
2797 );
2798
2799 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2800
2801 for my $item (@{ $self->{items} }) {
2802 my ($widget, $cb) = @$item;
2803
2804 # handle various types of items, only text for now
2805 if (!ref $widget) {
2806 $widget = new CFClient::UI::Label
2807 can_hover => 1,
2808 can_events => 1,
2809 text => $widget;
2810 }
2811
2812 $self->{item}{$widget} = $item;
2813
2814 $self->{vbox}->add ($widget);
2815 }
2816
2817 $self
2818}
2819
2820# popup given the event (must be a mouse button down event currently)
2821sub popup {
2822 my ($self, $ev) = @_;
2823
2824 $self->_emit ("popdown");
2825
2826 # maybe save $GRAB? must be careful about events...
2827 $GRAB = $self;
2828 $self->{button} = $ev->{button};
2829
2830 $self->show;
2831 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2832}
2833
2834sub mouse_motion {
2835 my ($self, $ev, $x, $y) = @_;
2836
2837 # TODO: should use vbox->find_widget or so
2838 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2839 $self->{hover} = $self->{item}{$HOVER};
2840}
2841
2842sub button_up {
2843 my ($self, $ev, $x, $y) = @_;
2844
2845 if ($ev->{button} == $self->{button}) {
2846 undef $GRAB;
2847 $self->hide;
2848
2125 $self->emit ("open"); 2849 $self->_emit ("popdown");
2850 $self->{hover}[1]->() if $self->{hover};
2851 }
2852}
2853
2854#############################################################################
2855
2856package CFClient::UI::Statusbox;
2857
2858our @ISA = CFClient::UI::VBox::;
2859
2860sub new {
2861 my $class = shift;
2862
2863 $class->SUPER::new (
2864 fontsize => 0.8,
2865 @_,
2866 )
2867}
2868
2869sub reorder {
2870 my ($self) = @_;
2871 my $NOW = time;
2872
2873 while (my ($k, $v) = each %{ $self->{item} }) {
2874 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2875 }
2876
2877 my @widgets;
2878
2879 my @items = sort {
2880 $a->{pri} <=> $b->{pri}
2881 or $b->{id} <=> $a->{id}
2882 } values %{ $self->{item} };
2883
2884 my $count = 10 + 1;
2885 for my $item (@items) {
2886 last unless --$count;
2887
2888 push @widgets, $item->{label} ||= do {
2889 # TODO: doesn't handle markup well (read as: at all)
2890 my $short = $item->{count} > 1
2891 ? "<b>$item->{count} ×</b> $item->{text}"
2892 : $item->{text};
2893
2894 for ($short) {
2895 s/^\s+//;
2896 s/\s+/ /g;
2897 }
2898
2899 new CFClient::UI::Label
2900 markup => $short,
2901 tooltip => $item->{tooltip},
2902 tooltip_font => $::FONT_PROP,
2903 tooltip_width => 0.67,
2904 fontsize => $item->{fontsize} || $self->{fontsize},
2905 max_w => $::WIDTH * 0.44,
2906 fg => $item->{fg},
2907 can_events => 1,
2908 can_hover => 1
2909 };
2910 }
2911
2912 $self->clear;
2913 $self->SUPER::add (reverse @widgets);
2914}
2915
2916sub add {
2917 my ($self, $text, %arg) = @_;
2918
2919 $text =~ s/^\s+//;
2920 $text =~ s/\s+$//;
2921
2922 return unless $text;
2923
2924 my $timeout = time + ((delete $arg{timeout}) || 60);
2925
2926 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2927
2928 if (my $item = $self->{item}{$group}) {
2929 if ($item->{text} eq $text) {
2930 $item->{count}++;
2931 } else {
2932 $item->{count} = 1;
2933 $item->{text} = $item->{tooltip} = $text;
2934 }
2935 $item->{id} = ++$self->{id};
2936 $item->{timeout} = $timeout;
2937 delete $item->{label};
2126 } else { 2938 } else {
2127 $CFClient::UI::ROOT->remove ($self->{other}); 2939 $self->{item}{$group} = {
2128 $self->emit ("close"); 2940 id => ++$self->{id},
2941 text => $text,
2942 timeout => $timeout,
2943 tooltip => $text,
2944 fg => [0.8, 0.8, 0.8, 0.8],
2945 pri => 0,
2946 count => 1,
2947 %arg,
2948 };
2129 } 2949 }
2130 2950
2131 $self->emit (changed => $self->{state}); 2951 $self->reorder;
2952}
2953
2954sub reconfigure {
2955 my ($self) = @_;
2956
2957 delete $_->{label}
2958 for values %{ $self->{item} || {} };
2959
2960 $self->reorder;
2961 $self->SUPER::reconfigure;
2132} 2962}
2133 2963
2134############################################################################# 2964#############################################################################
2135 2965
2136package CFClient::UI::Root; 2966package CFClient::UI::Root;
2137 2967
2138our @ISA = CFClient::UI::Container::; 2968our @ISA = CFClient::UI::Container::;
2139 2969
2140use CFClient::OpenGL; 2970use CFClient::OpenGL;
2141 2971
2142sub check_size { 2972sub new {
2143 my ($self) = @_; 2973 my $class = shift;
2144 2974
2145 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2975 $class->SUPER::new (
2146} 2976 visible => 1,
2147 2977 @_,
2148sub size_request { 2978 )
2149 ($::WIDTH, $::HEIGHT)
2150} 2979}
2151 2980
2152sub configure { 2981sub configure {
2153 my ($self, $x, $y, $w, $h) = @_; 2982 my ($self, $x, $y, $w, $h) = @_;
2154 2983
2155 $self->SUPER::configure ($x, $y, $w, $h); 2984 $self->{w} = $w;
2985 $self->{h} = $h;
2986}
2156 2987
2988sub check_size {
2989 my ($self) = @_;
2990
2991 $self->size_allocate ($self->{w}, $self->{h})
2992 if $self->{w};
2993}
2994
2995sub size_request {
2996 my ($self) = @_;
2997
2998 ($self->{w}, $self->{h})
2999}
3000
3001sub size_allocate {
3002 my ($self, $w, $h) = @_;
3003
2157 for my $child (@{$self->{children}}) { 3004 for my $child ($self->children) {
2158 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3005 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2159 3006
3007 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3008 if exists $child->{req_x};
3009
3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3011 if exists $child->{req_y};
3012
3013 delete @$child{qw(req_x req_y)};
3014
2160 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3015 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2161 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3016 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3017
2162 $child->configure ($X, $Y, $W,$H); 3018 $child->configure ($X, $Y, $W, $H);
2163 } 3019 }
2164} 3020}
2165 3021
2166sub _topleft { 3022sub coord2local {
2167 my ($self, $x, $y) = @_; 3023 my ($self, $x, $y) = @_;
2168 3024
2169 ($x, $y) 3025 ($x, $y)
2170} 3026}
2171 3027
3028sub coord2global {
3029 my ($self, $x, $y) = @_;
3030
3031 ($x, $y)
3032}
3033
2172sub update { 3034sub update {
2173 my ($self) = @_; 3035 my ($self) = @_;
2174 3036
2175 $self->check_size; 3037 $self->check_size;
2176 ::refresh (); 3038 $::WANT_REFRESH++;
2177} 3039}
2178 3040
2179sub add { 3041sub add {
2180 my ($self, $child) = @_; 3042 my ($self, @children) = @_;
2181 3043
3044 for my $child (@children) {
3045 $child->{is_toplevel} = 1;
3046
2182 # integerize window positions 3047 # integerise window positions
2183 $child->{x} = int $child->{x}; 3048 $child->{x} = int $child->{x};
2184 $child->{y} = int $child->{y}; 3049 $child->{y} = int $child->{y};
3050 }
2185 3051
2186 $self->SUPER::add ($child); 3052 $self->SUPER::add (@children);
3053
3054 for (my @widgets = @children; my $w = pop @widgets; ) {
3055 push @widgets, $w->children;
3056 $w->set_visible;
3057 }
3058
3059}
3060
3061sub remove {
3062 my ($self, @children) = @_;
3063
3064 $self->SUPER::remove (@children);
3065
3066 while (@children) {
3067 my $w = pop @children;
3068 push @children, $w->children;
3069 $w->set_invisible;
3070 }
2187} 3071}
2188 3072
2189sub on_refresh { 3073sub on_refresh {
2190 my ($self, $id, $cb) = @_; 3074 my ($self, $id, $cb) = @_;
2191 3075
2192 $self->{refresh_hook}{$id} = $cb; 3076 $self->{refresh_hook}{$id} = $cb;
2193} 3077}
2194 3078
3079sub on_post_alloc {
3080 my ($self, $id, $cb) = @_;
3081
3082 $self->{post_alloc_hook}{$id} = $cb;
3083}
3084
2195sub draw { 3085sub draw {
2196 my ($self) = @_; 3086 my ($self) = @_;
2197 3087
2198 while (my $rcb = delete $self->{refresh_hook}) { 3088 while ($self->{refresh_hook}) {
2199 $_->() for values %$rcb; 3089 $_->()
3090 for values %{delete $self->{refresh_hook}};
3091 }
3092
3093 if ($self->{check_size}) {
3094 my @queue;
3095
3096 for (;;) {
3097 if ($self->{check_size}) {
3098 #TODO use array-of-depth approach
3099
3100 @queue = sort { $a->{visible} <=> $b->{visible} }
3101 @queue, values %{delete $self->{check_size}};
3102 }
3103
3104 my $widget = pop @queue || last;
3105
3106 defined $widget->{visible} or last; # do not resize invisible widgets
3107
3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3109 ? @$widget{qw(def_w def_h)}
3110 : $widget->size_request;
3111
3112 if (delete $widget->{force_alloc}
3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3114 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3115
3116 $widget->{req_w} = $w;
3117 $widget->{req_h} = $h;
3118
3119 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3120
3121 $widget->{parent}->check_size
3122 if $widget->{parent};
3123 }
3124 }
3125 }
3126
3127 while ($self->{size_alloc}) {
3128 for (
3129 sort { $a->[0]{visible} <=> $b->[0]{visible} }
3130 values %{delete $self->{size_alloc}}
3131 ) {
3132 my ($widget, $w, $h) = @$_;
3133
3134 $w = 0 if $w < 0;
3135 $h = 0 if $h < 0;
3136
3137 $widget->{w} = $w;
3138 $widget->{h} = $h;
3139 $widget->emit (size_allocate => $w, $h);
3140 }
3141 }
3142
3143 while ($self->{post_alloc_hook}) {
3144 $_->()
3145 for values %{delete $self->{post_alloc_hook}};
2200 } 3146 }
2201 3147
2202 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3148 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2203 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3149 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2204 glClear GL_COLOR_BUFFER_BIT; 3150 glClear GL_COLOR_BUFFER_BIT;
2205 3151
2206 glMatrixMode GL_PROJECTION; 3152 glMatrixMode GL_PROJECTION;
2207 glLoadIdentity; 3153 glLoadIdentity;
2208 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3154 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2209 glMatrixMode GL_MODELVIEW; 3155 glMatrixMode GL_MODELVIEW;
2210 glLoadIdentity; 3156 glLoadIdentity;
2211 3157
2212 $self->_draw; 3158 $self->_draw;
2213} 3159}
… …
2215############################################################################# 3161#############################################################################
2216 3162
2217package CFClient::UI; 3163package CFClient::UI;
2218 3164
2219$ROOT = new CFClient::UI::Root; 3165$ROOT = new CFClient::UI::Root;
2220$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0; 3166$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2221 3167
22221 31681
2223 3169

Diff Legend

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