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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines