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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.152 by root, Sun Apr 23 01:05:03 2006 UTC vs.
Revision 1.250 by root, Sun May 28 02:31:03 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines