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.155 by root, Sun Apr 23 02:22:54 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;
23 46
24 my $tip = $widget->{tooltip}; 47 my $tip = $widget->{tooltip};
25 48
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 49 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 50
28 $TOOLTIP->set_text ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $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;
31 } 62 }
32 63
33 return; 64 return;
34 } 65 }
35 } 66 }
… …
39 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
40} 71}
41 72
42# class methods for events 73# class methods for events
43sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_down => $_[0])
76 if $FOCUS;
45} 77}
46 78
47sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS;
49} 82}
50 83
51sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
52 my ($ev) = @_; 85 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 94 check_tooltip;
62 } 95 }
63 96
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 98
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
100 if $GRAB;
67} 101}
68 102
69sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
70 my ($ev) = @_; 104 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
72 106
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 108
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 110
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
112 if $GRAB;
78 113
79 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 116 $grab->update if $grab;
82 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 134
100 check_tooltip; 135 check_tooltip;
101 } 136 }
102 137
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER;
104} 140}
105 141
106# convert position array to integers 142# convert position array to integers
107sub harmonize { 143sub harmonize {
108 my ($vals) = @_; 144 my ($vals) = @_;
… …
114 $rem += $_ - $i; 150 $rem += $_ - $i;
115 $_ = $i; 151 $_ = $i;
116 } 152 }
117} 153}
118 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
119############################################################################# 189#############################################################################
120 190
121package CFClient::UI::Base; 191package CFClient::UI::Base;
122 192
123use strict; 193use strict;
… …
126 196
127sub new { 197sub new {
128 my $class = shift; 198 my $class = shift;
129 199
130 my $self = bless { 200 my $self = bless {
131 x => 0, 201 x => 0,
132 y => 0, 202 y => 0,
133 z => 0, 203 z => 0,
134 can_events => 1, 204 can_events => 1,
135 @_ 205 @_
136 }, $class; 206 }, $class;
137 207
138 for (keys %$self) { 208 for (keys %$self) {
139 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
141 } 211 }
142 } 212 }
143 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
144 $self 223 $self
145} 224}
146 225
226sub destroy {
227 my ($self) = @_;
228
229 $self->hide;
230 %$self = ();
231}
232
147sub show { 233sub show {
148 my ($self) = @_; 234 my ($self) = @_;
149 235
150 return if $self->{parent}; 236 return if $self->{parent};
151 237
152 $CFClient::UI::ROOT->add ($self); 238 $CFClient::UI::ROOT->add ($self);
153} 239}
154 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
155sub hide { 302sub hide {
156 my ($self) = @_; 303 my ($self) = @_;
157 304
158 return unless $self->{parent}; 305 $self->set_invisible;
159 306
160 $self->{parent}->remove ($self); 307 $self->{parent}->remove ($self)
308 if $self->{parent};
161} 309}
162 310
163sub move { 311sub move {
164 my ($self, $x, $y, $z) = @_; 312 my ($self, $x, $y, $z) = @_;
165 313
… …
168 $self->{z} = $z if defined $z; 316 $self->{z} = $z if defined $z;
169 317
170 $self->update; 318 $self->update;
171} 319}
172 320
173sub needs_redraw { 321sub set_size {
174 0 322 my ($self, $w, $h) = @_;
323
324 $self->{def_w} = $w;
325 $self->{def_h} = $h;
326
327 $self->check_size;
175} 328}
176 329
177sub size_request { 330sub size_request {
178 require Carp; 331 require Carp;
179 Carp::confess "size_request is abstract"; 332 Carp::confess "size_request is abstract";
… …
199 $self->{y} = $y; 352 $self->{y} = $y;
200 $self->update; 353 $self->update;
201 } 354 }
202 355
203 if ($self->{w} != $w || $self->{h} != $h) { 356 if ($self->{w} != $w || $self->{h} != $h) {
204 $self->{w} = $w; 357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];
205 $self->{h} = $h;
206
207 $self->size_allocate ($w, $h);
208 $self->update;
209 } 358 }
210} 359}
211 360
212sub size_allocate { 361sub size_allocate {
213 # nothing to be done 362 # nothing to be done
214} 363}
215 364
216# return top left coordinates 365sub reconfigure {
217sub _topleft { 366 my ($self) = @_;
367
368 $self->check_size (1);
369 $self->update;
370}
371
372sub children {
373}
374
375sub set_max_size {
218 my ($self, $x, $y) = @_; 376 my ($self, $w, $h) = @_;
219 377
220 $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 }
221} 396}
222 397
223# translate global coordinates to local coordinate system 398# translate global coordinates to local coordinate system
224sub coord2local { 399sub coord2local {
225 my ($self, $x, $y) = @_; 400 my ($self, $x, $y) = @_;
226 401
227 my ($X, $Y) = $self->_topleft; 402 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
228 ($x - $X, $y - $Y)
229} 403}
230 404
231# translate local coordinates to global coordinate system 405# translate local coordinates to global coordinate system
232sub coord2global { 406sub coord2global {
233 my ($self, $x, $y) = @_; 407 my ($self, $x, $y) = @_;
234 408
235 my ($X, $Y) = $self->_topleft; 409 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
236 ($x + $X, $y + $Y)
237} 410}
238 411
239sub focus_in { 412sub focus_in {
240 my ($self) = @_; 413 my ($self) = @_;
241 414
242 return if $FOCUS == $self; 415 return if $FOCUS == $self;
243 return unless $self->{can_focus}; 416 return unless $self->{can_focus};
244 417
245 my $focus = $FOCUS; $FOCUS = $self; 418 my $focus = $FOCUS; $FOCUS = $self;
246 419
247 $self->emit (focus_in => $focus); 420 $self->_emit (focus_in => $focus);
248 421
249 $focus->update if $focus; 422 $focus->update if $focus;
250 $FOCUS->update; 423 $FOCUS->update;
251} 424}
252 425
… …
255 428
256 return unless $FOCUS == $self; 429 return unless $FOCUS == $self;
257 430
258 my $focus = $FOCUS; undef $FOCUS; 431 my $focus = $FOCUS; undef $FOCUS;
259 432
260 $self->emit (focus_out => $focus); 433 $self->_emit (focus_out => $focus);
261 434
262 $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;
263} 439}
264 440
265sub mouse_motion { } 441sub mouse_motion { }
266sub button_up { } 442sub button_up { }
267sub key_down { } 443sub key_down { }
268sub key_up { } 444sub key_up { }
269 445
270sub button_down { 446sub button_down {
271 my ($self, $ev, $x, $y) = @_; 447 my ($self, $ev, $x, $y) = @_;
272 448
273 $self->focus_in; 449 $self->focus_in;
… …
301 glVertex $x + $self->{w}, $y + $self->{h}; 477 glVertex $x + $self->{w}, $y + $self->{h};
302 glVertex $x , $y + $self->{h}; 478 glVertex $x , $y + $self->{h};
303 glEnd; 479 glEnd;
304 glDisable GL_BLEND; 480 glDisable GL_BLEND;
305 } 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 }
306} 496}
307 497
308sub _draw { 498sub _draw {
309 my ($self) = @_; 499 my ($self) = @_;
310 500
… …
325 515
326sub set_parent { 516sub set_parent {
327 my ($self, $parent) = @_; 517 my ($self, $parent) = @_;
328 518
329 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;
330} 524}
331 525
332sub check_size { 526sub check_size {
333 my ($self) = @_; 527 my ($self, $forced) = @_;
334 528
335 return unless $self->{parent}; 529 $self->{force_alloc} = 1 if $forced;
336 530 $CFClient::UI::ROOT->{check_size}{$self} = $self;
337 my ($w, $h) = $self->size_request;
338
339 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w;
341 $self->{req_h} = $h;
342
343 $self->{parent}->check_size;
344 }
345} 531}
346 532
347sub update { 533sub update {
348 my ($self) = @_; 534 my ($self) = @_;
349 535
… …
355 my ($self, $signal, $cb) = @_; 541 my ($self, $signal, $cb) = @_;
356 542
357 push @{ $self->{signal_cb}{$signal} }, $cb; 543 push @{ $self->{signal_cb}{$signal} }, $cb;
358} 544}
359 545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
360sub emit { 552sub emit {
361 my ($self, $signal, @args) = @_; 553 my ($self, $signal, @args) = @_;
362 554
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 555 $self->_emit ($signal, @args)
364 $cb->($self, @args); 556 || $self->$signal (@args);
365 } 557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
366} 561}
367 562
368sub DESTROY { 563sub DESTROY {
369 my ($self) = @_; 564 my ($self) = @_;
370 565
566 delete $WIDGET{$self+0};
371 #$self->deactivate; 567 #$self->deactivate;
372} 568}
373 569
374############################################################################# 570#############################################################################
375 571
… …
384 my $class = shift; 580 my $class = shift;
385 581
386 # range [value, low, high, page] 582 # range [value, low, high, page]
387 583
388 $class->SUPER::new ( 584 $class->SUPER::new (
389 bg => [0, 0, 0, 0.2], 585 #bg => [0, 0, 0, 0.2],
390 active_bg => [1, 1, 1, 0.5], 586 #active_bg => [1, 1, 1, 0.5],
391 @_ 587 @_
392 ) 588 )
393} 589}
394 590
395sub _draw { 591sub _draw {
396 my ($self) = @_; 592 my ($self) = @_;
397 593
594 my $color = $FOCUS == $self && $self->{active_bg}
595 ? $self->{active_bg}
596 : $self->{bg};
597
598 if ($color && (@$color < 4 || $color->[3])) {
398 my ($w, $h) = @$self{qw(w h)}; 599 my ($w, $h) = @$self{qw(w h)};
399 600
400 glEnable GL_BLEND; 601 glEnable GL_BLEND;
401 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
402 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 603 glColor @$color;
403 604
404 glBegin GL_QUADS; 605 glBegin GL_QUADS;
405 glVertex 0 , 0; 606 glVertex 0 , 0;
406 glVertex 0 , $h; 607 glVertex 0 , $h;
407 glVertex $w, $h; 608 glVertex $w, $h;
408 glVertex $w, 0; 609 glVertex $w, 0;
409 glEnd; 610 glEnd;
410 611
411 glDisable GL_BLEND; 612 glDisable GL_BLEND;
613 }
412} 614}
413 615
414############################################################################# 616#############################################################################
415 617
416package CFClient::UI::Empty; 618package CFClient::UI::Empty;
… …
437sub new { 639sub new {
438 my ($class, %arg) = @_; 640 my ($class, %arg) = @_;
439 641
440 my $children = delete $arg{children} || []; 642 my $children = delete $arg{children} || [];
441 643
442 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 );
443 $self->add ($_) for @$children; 649 $self->add ($_) for @$children;
444 650
445 $self 651 $self
446} 652}
447 653
448sub add { 654sub add {
449 my ($self, $child) = @_; 655 my ($self, @widgets) = @_;
450 656
451 $child->set_parent ($self); 657 $_->set_parent ($self)
658 for @widgets;
452 659
453 use sort 'stable'; 660 use sort 'stable';
454 661
455 $self->{children} = [ 662 $self->{children} = [
456 sort { $a->{z} <=> $b->{z} } 663 sort { $a->{z} <=> $b->{z} }
457 @{$self->{children}}, $child 664 @{$self->{children}}, @widgets
458 ]; 665 ];
459 666
460 $child->check_size; 667 $self->check_size (1);
668 $self->update;
669}
670
671sub children {
672 @{ $_[0]{children} }
461} 673}
462 674
463sub remove { 675sub remove {
464 my ($self, $child) = @_; 676 my ($self, $child) = @_;
465 677
466 delete $child->{parent}; 678 delete $child->{parent};
679 $child->hide;
467 680
468 $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 }
469 697
470 $self->check_size; 698 $self->check_size;
471 $self->update; 699 $self->update;
472} 700}
473 701
… …
551} 779}
552 780
553sub update { 781sub update {
554 my ($self) = @_; 782 my ($self) = @_;
555 783
556 # we want to do this delayed... 784 $ROOT->on_post_alloc ($self => sub { $self->render_child });
557 $self->render_chld;
558 $self->SUPER::update; 785 $self->SUPER::update;
559}
560
561sub render_chld {
562 my ($self) = @_;
563
564 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
565 glClearColor 0, 0, 0, 1;
566 glClear GL_COLOR_BUFFER_BIT;
567 $self->child->draw;
568 };
569} 786}
570 787
571sub size_allocate { 788sub size_allocate {
572 my ($self, $w, $h) = @_; 789 my ($self, $w, $h) = @_;
573 790
574 $self->child->configure (0, 0, $w, $h); 791 $self->SUPER::size_allocate ($w, $h);
792 $self->update;
793}
575 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
576 $self->render_chld; 806 $self->_render;
807 };
577} 808}
578 809
579sub _draw { 810sub _draw {
580 my ($self) = @_; 811 my ($self) = @_;
581 812
582 my ($w, $h) = ($self->w, $self->h); 813 my ($w, $h) = ($self->w, $self->h);
583 814
584 my $tex = $self->{texture} 815 my $tex = $self->{texture}
585 or return; 816 or return;
586 817
587 glEnable GL_BLEND;
588 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
589 glEnable GL_TEXTURE_2D; 818 glEnable GL_TEXTURE_2D;
590 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;
591 821
592 $tex->draw_quad (0, 0, $w, $h); 822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
593 823
594 glDisable GL_BLEND;
595 glDisable GL_TEXTURE_2D; 824 glDisable GL_TEXTURE_2D;
596} 825}
597 826
598############################################################################# 827#############################################################################
599 828
600package CFClient::UI::ViewPort; 829package CFClient::UI::ViewPort;
601 830
602our @ISA = CFClient::UI::Window::; 831our @ISA = CFClient::UI::Window::;
603
604sub new { die }
605
606sub size_request {
607 my ($self) = @_;
608
609 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
610 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
611
612 @$self{qw(child_w child_h)}
613}
614
615sub _draw {
616 my ($self) = @_;
617
618 $self->{children}[1]->draw;
619}
620
621
622#############################################################################
623
624package CFClient::UI::Frame;
625
626our @ISA = CFClient::UI::Bin::;
627
628use CFClient::OpenGL;
629 832
630sub new { 833sub new {
631 my $class = shift; 834 my $class = shift;
632 835
633 my $self = $class->SUPER::new ( 836 $class->SUPER::new (
634 bg => [1, 1, 1, 1], 837 scroll_x => 0,
635 border_bg => [1, 1, 1, 1], 838 scroll_y => 1,
636 border => 0.8,
637 @_ 839 @_,
638 ); 840 )
639
640 $self
641}
642
643sub set_size {
644 my ($self, $w, $h) = @_;
645 $self->{req_w} = $w;
646 $self->{req_h} = $h;
647 $self->check_size;
648} 841}
649 842
650sub size_request { 843sub size_request {
651 my ($self) = @_; 844 my ($self) = @_;
652 ($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)
653} 852}
654 853
655sub size_allocate { 854sub size_allocate {
656 my ($self, $w, $h) = @_; 855 my ($self, $w, $h) = @_;
657 $self->{w} = $w; 856
658 $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
659 $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 )
660} 978}
661 979
662sub _draw { 980sub _draw {
663 my ($self) = @_; 981 my ($self) = @_;
664 982
665 my ($w, $h) = ($self->{w}, $self->{h}); 983 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)};
666 985
667 glEnable GL_BLEND; 986 glEnable GL_BLEND;
668 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
669 glEnable GL_TEXTURE_2D; 988 glColor @{ $self->{bg} };
670 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
671 989
672# glBegin GL_QUADS; 990 glBegin GL_QUADS;
673# glColor 0, 0, 0, 0;
674# glVertex 0 , 0; 991 glVertex 0 , 0;
675# glVertex 0 , $h; 992 glVertex 0 , $h;
676# glVertex $w, $h; 993 glVertex $w, $h;
677# glVertex $w, 0; 994 glVertex $w, 0;
678# glEnd; 995 glEnd;
679 996
680
681 $self->child->draw;
682 glDisable GL_BLEND; 997 glDisable GL_BLEND;
683 glDisable GL_TEXTURE_2D; 998 }
999
1000 $self->SUPER::_draw;
684} 1001}
685 1002
686############################################################################# 1003#############################################################################
687 1004
688package CFClient::UI::FancyFrame; 1005package CFClient::UI::FancyFrame;
… …
696 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);
697 1014
698sub new { 1015sub new {
699 my $class = shift; 1016 my $class = shift;
700 1017
701 # TODO: user_x, user_y, overwrite moveto?
702
703 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
706 border => 0.8, 1021 border => 0.6,
1022 is_toplevel => 1,
707 can_events => 1, 1023 can_events => 1,
708 @_ 1024 @_
709 ); 1025 );
710 1026
711 $self->{title} &&= new CFClient::UI::Label 1027 $self->{title} &&= new CFClient::UI::Label
712 align => 0, 1028 align => 0,
713 valign => 1, 1029 valign => 1,
714 text => $self->{title}, 1030 text => $self->{title},
715 fontsize => 1; 1031 fontsize => $self->{border};
716 1032
717 $self 1033 $self
718} 1034}
719 1035
720sub border { 1036sub border {
721 int $_[0]{border} * $::FONTSIZE 1037 int $_[0]{border} * $::FONTSIZE
722} 1038}
723 1039
724sub size_request { 1040sub size_request {
725 my ($self) = @_; 1041 my ($self) = @_;
726
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728 1042
729 my ($w, $h) = $self->SUPER::size_request; 1043 my ($w, $h) = $self->SUPER::size_request;
730 1044
731 ( 1045 (
732 $w + $self->border * 2, 1046 $w + $self->border * 2,
… …
738 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h) = @_;
739 1053
740 $h -= List::Util::max 0, $self->border * 2; 1054 $h -= List::Util::max 0, $self->border * 2;
741 $w -= List::Util::max 0, $self->border * 2; 1055 $w -= List::Util::max 0, $self->border * 2;
742 1056
743 $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)
744 if $self->{title}; 1058 if $self->{title};
745 1059
746 $self->child->configure ($self->border, $self->border, $w, $h); 1060 $self->child->configure ($self->border, $self->border, $w, $h);
747} 1061}
748 1062
749sub button_down { 1063sub button_down {
750 my ($self, $ev, $x, $y) = @_; 1064 my ($self, $ev, $x, $y) = @_;
751 1065
1066 my ($w, $h) = @$self{qw(w h)};
752 my $border = $self->border; 1067 my $border = $self->border;
753 1068
754 if ($x < $self->{w} && $x >= $self->{w} - $border 1069 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
755 && $y < $self->{h} && $y >= $self->{h} - $border) { 1070 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
756 1071
1072 if ($lr & $td) {
1073 my ($wx, $wy) = ($self->{x}, $self->{y});
757 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1074 my ($ox, $oy) = ($ev->{x}, $ev->{y});
758 my ($bw, $bh) = ($self->{w}, $self->{h}); 1075 my ($bw, $bh) = ($self->{w}, $self->{h});
759 1076
1077 my $mx = $x < $border;
1078 my $my = $y < $border;
1079
760 $self->{motion} = sub { 1080 $self->{motion} = sub {
761 my ($ev, $x, $y) = @_; 1081 my ($ev, $x, $y) = @_;
762 1082
763 ($x, $y) = ($ev->{x}, $ev->{y}); 1083 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy;
764 1085
765 $self->{user_w} = $bw + $x - $ox; 1086 $self->{user_x} = $wx + $dx * $mx;
766 $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});
767 $self->check_size; 1091 $self->check_size;
768 }; 1092 };
769 1093
770 } elsif ($x >= 0 && $x < $self->{w} 1094 } elsif ($lr ^ $td) {
771 && $y >= 0 && $y < $border) {
772
773 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
774 my ($bx, $by) = ($self->{x}, $self->{y}); 1096 my ($bx, $by) = ($self->{x}, $self->{y});
775 1097
776 $self->{motion} = sub { 1098 $self->{motion} = sub {
777 my ($ev, $x, $y) = @_; 1099 my ($ev, $x, $y) = @_;
778 1100
779 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
780 1102
781 $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});
782 $self->update; 1107 $self->update;
783 }; 1108 };
784 } 1109 }
785} 1110}
786 1111
… …
800 my ($self) = @_; 1125 my ($self) = @_;
801 1126
802 my ($w, $h ) = ($self->{w}, $self->{h}); 1127 my ($w, $h ) = ($self->{w}, $self->{h});
803 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
804 1129
805 glEnable GL_BLEND;
806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
807 glEnable GL_TEXTURE_2D; 1130 glEnable GL_TEXTURE_2D;
808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
809 1132
810 my $border = $self->border; 1133 my $border = $self->border;
811 1134
812 glColor @{ $self->{border_bg} }; 1135 glColor @{ $self->{border_bg} };
813 $tex[1]->draw_quad (0, 0, $w, $border); 1136 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
814 $tex[3]->draw_quad (0, $border, $border, $ch); 1137 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
815 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1138 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
816 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1139 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
817 1140
1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
818 my $bg = $tex[0]; 1142 my $bg = $tex[0];
819 1143
820 # TODO: repeat texture not scale 1144 # TODO: repeat texture not scale
821 my $rep_x = $cw / $bg->{w}; 1145 my $rep_x = $cw / $bg->{w};
822 my $rep_y = $ch / $bg->{h}; 1146 my $rep_y = $ch / $bg->{h};
823 1147
824 glColor @{ $self->{bg} }; 1148 glColor @{ $self->{bg} };
825 1149
826 $bg->{s} = $rep_x; 1150 $bg->{s} = $rep_x;
827 $bg->{t} = $rep_y; 1151 $bg->{t} = $rep_y;
828 $bg->{wrap_mode} = 1; 1152 $bg->{wrap_mode} = 1;
829 $bg->draw_quad ($border, $border, $cw, $ch); 1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 }
830 1155
831 glDisable GL_TEXTURE_2D; 1156 glDisable GL_TEXTURE_2D;
832 glDisable GL_BLEND;
833 1157
834 $self->{title}->draw if $self->{title}; 1158 $self->{title}->draw if $self->{title};
1159
835 $self->child->draw; 1160 $self->child->draw;
836} 1161}
837 1162
838############################################################################# 1163#############################################################################
839 1164
… …
848sub new { 1173sub new {
849 my $class = shift; 1174 my $class = shift;
850 1175
851 $class->SUPER::new ( 1176 $class->SUPER::new (
852 col_expand => [], 1177 col_expand => [],
853 @_ 1178 @_,
854 ) 1179 )
1180}
1181
1182sub children {
1183 grep $_, map @$_, grep $_, @{ $_[0]{children} }
855} 1184}
856 1185
857sub add { 1186sub add {
858 my ($self, $x, $y, $child) = @_; 1187 my ($self, $x, $y, $child) = @_;
859 1188
860 $child->set_parent ($self); 1189 $child->set_parent ($self);
861 $self->{children}[$y][$x] = $child; 1190 $self->{children}[$y][$x] = $child;
862 1191
863 $child->check_size; 1192 $self->check_size (1);
864} 1193}
865 1194
866# 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?
867sub clear { 1196sub clear {
868 my ($self) = @_; 1197 my ($self) = @_;
869 1198
1199 my @children = $self->children;
870 delete $self->{children}; 1200 delete $self->{children};
1201
1202 for (@children) {
1203 delete $_->{parent};
1204 $_->hide;
1205 }
1206
1207 $self->check_size (1);
871 $self->update; 1208 $self->update;
872} 1209}
873 1210
874sub get_wh { 1211sub get_wh {
875 my ($self) = @_; 1212 my ($self) = @_;
… …
907sub size_allocate { 1244sub size_allocate {
908 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h) = @_;
909 1246
910 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
911 1248
912 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
913 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
914 1251
915 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
916 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
917 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
918 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
972 } 1309 }
973} 1310}
974 1311
975############################################################################# 1312#############################################################################
976 1313
977package CFClient::UI::HBox; 1314package CFClient::UI::Box;
978
979# TODO: wrap into common Box base class
980 1315
981our @ISA = CFClient::UI::Container::; 1316our @ISA = CFClient::UI::Container::;
982 1317
983sub size_request { 1318sub size_request {
984 my ($self) = @_; 1319 my ($self) = @_;
985 1320
986 my @alloc = map [$_->size_request], @{$self->{children}}; 1321 $self->{vertical}
987 1322 ? (
988 ( 1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
989 (List::Util::sum map $_->[0], @alloc), 1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
990 (List::Util::max map $_->[1], @alloc), 1325 )
991 ) 1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
992} 1330}
993 1331
994sub size_allocate { 1332sub size_allocate {
995 my ($self, $w, $h) = @_; 1333 my ($self, $w, $h) = @_;
996 1334
997 ($h, $w) = ($w, $h); 1335 my $space = $self->{vertical} ? $h : $w;
998
999 my $children = $self->{children}; 1336 my $children = $self->{children};
1000 1337
1001 my @h = map $_->{req_w}, @$children; 1338 my @req;
1002 1339
1003 my $req_h = List::Util::sum @h; 1340 if ($self->{homogeneous}) {
1004 1341 @req = ($space / (@$children || 1)) x @$children;
1005 if ($req_h > $h) {
1006 # ah well, not enough space
1007 $_ *= $h / $req_h for @h;
1008 } 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 {
1009 my $exp = List::Util::sum map $_->{expand}, @$children; 1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1010 $exp ||= 1;
1011 1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1012 for (0 .. $#$children) { 1355 for 0 .. $#$children;
1013 my $child = $children->[$_];
1014
1015 my $alloc_h = $h[$_];
1016 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1017 $h[$_] = $alloc_h;
1018 } 1356 }
1019 } 1357 }
1020 1358
1021 CFClient::UI::harmonize \@h; 1359 CFClient::UI::harmonize \@req;
1022 1360
1023 my $y = 0; 1361 my $pos = 0;
1024 for (0 .. $#$children) { 1362 for (0 .. $#$children) {
1025 my $child = $children->[$_];
1026 my $h = $h[$_]; 1363 my $alloc = $req[$_];
1027 $child->configure ($y, 0, $h, $w); 1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1028 1365
1029 $y += $h; 1366 $pos += $alloc;
1030 } 1367 }
1031 1368
1032 1 1369 1
1033} 1370}
1034 1371
1035############################################################################# 1372#############################################################################
1036 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
1037package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1038 1390
1039# TODO: wrap into common Box base class
1040
1041our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1042 1392
1043sub size_request { 1393sub new {
1044 my ($self) = @_; 1394 my $class = shift;
1045 1395
1046 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1047 1397 vertical => 1,
1048 ( 1398 @_,
1049 (List::Util::max map $_->[0], @alloc),
1050 (List::Util::sum map $_->[1], @alloc),
1051 ) 1399 )
1052} 1400}
1053 1401
1054sub size_allocate {
1055 my ($self, $w, $h) = @_;
1056
1057 my $children = $self->{children};
1058
1059 my @h = map $_->{req_h}, @$children;
1060
1061 my $req_h = List::Util::sum @h;
1062
1063 if ($req_h > $h) {
1064 # ah well, not enough space
1065 $_ *= $h / $req_h for @h;
1066 } else {
1067 my $exp = List::Util::sum map $_->{expand}, @$children;
1068 $exp ||= 1;
1069
1070 for (0 .. $#$children) {
1071 my $child = $children->[$_];
1072
1073 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1074 }
1075 }
1076
1077 CFClient::UI::harmonize \@h;
1078
1079 my $y = 0;
1080 for (0 .. $#$children) {
1081 my $child = $children->[$_];
1082 my $h = $h[$_];
1083 $child->configure (0, $y, $w, $h);
1084
1085 $y += $h;
1086 }
1087
1088 1
1089}
1090
1091############################################################################# 1402#############################################################################
1092 1403
1093package CFClient::UI::Label; 1404package CFClient::UI::Label;
1094 1405
1095our @ISA = CFClient::UI::Base::; 1406our @ISA = CFClient::UI::DrawBG::;
1096 1407
1097use CFClient::OpenGL; 1408use CFClient::OpenGL;
1098 1409
1099sub new { 1410sub new {
1100 my ($class, %arg) = @_; 1411 my ($class, %arg) = @_;
1101 1412
1102 my $self = $class->SUPER::new ( 1413 my $self = $class->SUPER::new (
1103 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),
1104 fontsize => 1, 1423 fontsize => 1,
1105 text => "",
1106 align => -1, 1424 align => -1,
1107 valign => -1, 1425 valign => -1,
1108 padding => 2, 1426 padding => 2,
1109 layout => new CFClient::Layout,
1110 can_events => 0, 1427 can_events => 0,
1111 %arg 1428 %arg
1112 ); 1429 );
1113 1430
1114 if (exists $self->{template}) { 1431 if (exists $self->{template}) {
1115 my $layout = new CFClient::Layout; 1432 my $layout = new CFClient::Layout;
1116 $layout->set_text (delete $self->{template}); 1433 $layout->set_text (delete $self->{template});
1117 $self->{template} = $layout; 1434 $self->{template} = $layout;
1118 } 1435 }
1119 1436
1120 $self->set_text (delete $self->{text}) if exists $self->{text}; 1437 if (exists $self->{markup}) {
1121 $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 }
1122 1442
1123 $self 1443 $self
1124} 1444}
1125 1445
1126sub escape_text { 1446sub escape($) {
1127 local $_ = $_[1]; 1447 local $_ = $_[0];
1128 1448
1129 s/&/&amp;/g; 1449 s/&/&amp;/g;
1130 s/>/&gt;/g; 1450 s/>/&gt;/g;
1131 s/</&lt;/g; 1451 s/</&lt;/g;
1132 1452
1133 $_[1] 1453 $_
1454}
1455
1456sub update {
1457 my ($self) = @_;
1458
1459 delete $self->{texture};
1460 $self->SUPER::update;
1134} 1461}
1135 1462
1136sub set_text { 1463sub set_text {
1137 my ($self, $text) = @_; 1464 my ($self, $text) = @_;
1138 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;
1139 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1140 1471
1141 delete $self->{texture}; 1472 $self->update;
1142 $self->check_size; 1473 $self->check_size;
1143 $self->update;
1144} 1474}
1145 1475
1146sub set_markup { 1476sub set_markup {
1147 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1148 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;
1149 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1150 1486
1151 delete $self->{texture}; 1487 $self->update;
1152 $self->check_size; 1488 $self->check_size;
1153 $self->update;
1154} 1489}
1155 1490
1156sub size_request { 1491sub size_request {
1157 my ($self) = @_; 1492 my ($self) = @_;
1158 1493
1159 $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});
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1499
1162 my ($w, $h) = $self->{layout}->size; 1500 my ($w, $h) = $self->{layout}->size;
1163 1501
1164 if (exists $self->{template}) { 1502 if (exists $self->{template}) {
1503 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1505
1167 my ($w2, $h2) = $self->{template}->size; 1506 my ($w2, $h2) = $self->{template}->size;
1168 1507
1169 $w = List::Util::max $w, $w2; 1508 $w = List::Util::max $w, $w2;
… …
1185sub set_fontsize { 1524sub set_fontsize {
1186 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1187 1526
1188 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1189 delete $self->{texture}; 1528 delete $self->{texture};
1529
1530 $self->update;
1190 $self->check_size; 1531 $self->check_size;
1191 $self->update;
1192} 1532}
1193 1533
1194sub _draw { 1534sub _draw {
1195 my ($self) = @_; 1535 my ($self) = @_;
1196 1536
1537 $self->SUPER::_draw; # draw background, if applicable
1538
1197 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};
1198 $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});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546
1200 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
1201 }; 1558 };
1202 1559
1203 glEnable GL_BLEND;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205 glEnable GL_TEXTURE_2D; 1560 glEnable GL_TEXTURE_2D;
1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1207 1562
1563 if ($tex->{format} == GL_ALPHA) {
1208 glColor @{$self->{fg}}; 1564 glColor @{$self->{fg}};
1209
1210 $self->{ox} = int (
1211 $self->{align} < 0 ? $self->{padding}
1212 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1213 : ($self->{w} - $tex->{w}) * 0.5
1214 );
1215
1216 $self->{oy} = int (
1217 $self->{valign} < 0 ? $self->{padding}
1218 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1219 : ($self->{h} - $tex->{h}) * 0.5
1220 );
1221
1222 $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 }
1223 1569
1224 glDisable GL_TEXTURE_2D; 1570 glDisable GL_TEXTURE_2D;
1225 glDisable GL_BLEND;
1226} 1571}
1227 1572
1228############################################################################# 1573#############################################################################
1229 1574
1230package CFClient::UI::EntryBase; 1575package CFClient::UI::EntryBase;
… …
1235 1580
1236sub new { 1581sub new {
1237 my $class = shift; 1582 my $class = shift;
1238 1583
1239 $class->SUPER::new ( 1584 $class->SUPER::new (
1240 fg => [1, 1, 1], 1585 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1586 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1587 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1588 active_fg => [0, 0, 0],
1244 can_hover => 1, 1589 can_hover => 1,
1245 can_focus => 1, 1590 can_focus => 1,
1246 valign => 0, 1591 valign => 0,
1247 can_events => 1, 1592 can_events => 1,
1593 #text => ...
1248 @_ 1594 @_
1249 ) 1595 )
1250} 1596}
1251 1597
1252sub _set_text { 1598sub _set_text {
… …
1262 $self->{text} = $text; 1608 $self->{text} = $text;
1263 1609
1264 $text =~ s/./*/g if $self->{hidden}; 1610 $text =~ s/./*/g if $self->{hidden};
1265 $self->{layout}->set_text ("$text "); 1611 $self->{layout}->set_text ("$text ");
1266 1612
1267 $self->emit (changed => $self->{text}); 1613 $self->_emit (changed => $self->{text});
1268}
1269
1270sub get_text {
1271 $_[0]{text}
1272}
1273
1274sub size_request {
1275 my ($self) = @_;
1276
1277 my ($w, $h) = $self->SUPER::size_request;
1278
1279 ($w + 1, $h) # add 1 for cursor
1280}
1281
1282sub size_allocate {
1283 my ($self, $w, $h) = @_;
1284
1285 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1286} 1614}
1287 1615
1288sub set_text { 1616sub set_text {
1289 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1290 1618
1291 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1292 $self->_set_text ($text); 1620 $self->_set_text ($text);
1293 $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
1294} 1635}
1295 1636
1296sub key_down { 1637sub key_down {
1297 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1298 1639
… …
1300 my $sym = $ev->{sym}; 1641 my $sym = $ev->{sym};
1301 my $uni = $ev->{unicode}; 1642 my $uni = $ev->{unicode};
1302 1643
1303 my $text = $self->get_text; 1644 my $text = $self->get_text;
1304 1645
1305 if ($sym == 8) { 1646 if ($uni == 8) {
1306 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1647 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1307 } elsif ($sym == 127) { 1648 } elsif ($uni == 127) {
1308 substr $text, $self->{cursor}, 1, ""; 1649 substr $text, $self->{cursor}, 1, "";
1309 } elsif ($sym == CFClient::SDLK_LEFT) { 1650 } elsif ($sym == CFClient::SDLK_LEFT) {
1310 --$self->{cursor} if $self->{cursor}; 1651 --$self->{cursor} if $self->{cursor};
1311 } elsif ($sym == CFClient::SDLK_RIGHT) { 1652 } elsif ($sym == CFClient::SDLK_RIGHT) {
1312 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1653 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1313 } elsif ($sym == CFClient::SDLK_HOME) { 1654 } elsif ($sym == CFClient::SDLK_HOME) {
1314 $self->{cursor} = 0; 1655 $self->{cursor} = 0;
1315 } elsif ($sym == CFClient::SDLK_END) { 1656 } elsif ($sym == CFClient::SDLK_END) {
1316 $self->{cursor} = length $text; 1657 $self->{cursor} = length $text;
1317 } elsif ($sym == 27) { 1658 } elsif ($uni == 27) {
1318 $self->emit ('escape'); 1659 $self->_emit ('escape');
1319 } elsif ($uni) { 1660 } elsif ($uni) {
1320 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1321 } 1662 }
1322 1663
1323 $self->_set_text ($text); 1664 $self->_set_text ($text);
1324 $self->update; 1665 $self->update;
1666 $self->check_size;
1325} 1667}
1326 1668
1327sub focus_in { 1669sub focus_in {
1328 my ($self) = @_; 1670 my ($self) = @_;
1329 1671
… …
1405 my ($self, $ev) = @_; 1747 my ($self, $ev) = @_;
1406 1748
1407 my $sym = $ev->{sym}; 1749 my $sym = $ev->{sym};
1408 1750
1409 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} = '';
1410 $self->emit (activate => $self->get_text); 1756 $self->_emit (activate => $txt);
1411 $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 }
1412 1780
1413 } else { 1781 } else {
1414 $self->SUPER::key_down ($ev); 1782 $self->SUPER::key_down ($ev);
1415 } 1783 }
1416 1784
… …
1430 1798
1431sub new { 1799sub new {
1432 my $class = shift; 1800 my $class = shift;
1433 1801
1434 $class->SUPER::new ( 1802 $class->SUPER::new (
1435 padding => 4, 1803 padding => 4,
1436 fg => [1, 1, 1], 1804 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1805 active_fg => [0, 0, 1],
1439 can_hover => 1, 1806 can_hover => 1,
1440 align => 0, 1807 align => 0,
1441 valign => 0, 1808 valign => 0,
1442 can_events => 1, 1809 can_events => 1,
1443 @_ 1810 @_
1444 ) 1811 )
1445} 1812}
1446 1813
1814sub activate { }
1815
1447sub button_up { 1816sub button_up {
1448 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1449 1818
1819 $self->emit ("activate")
1450 if ($x >= 0 && $x < $self->{w} 1820 if $x >= 0 && $x < $self->{w}
1451 && $y >= 0 && $y < $self->{h}) { 1821 && $y >= 0 && $y < $self->{h};
1452 $self->emit ("activate");
1453 }
1454} 1822}
1455 1823
1456sub _draw { 1824sub _draw {
1457 my ($self) = @_; 1825 my ($self) = @_;
1458 1826
… …
1460 1828
1461 if ($GRAB == $self) { 1829 if ($GRAB == $self) {
1462 $self->{fg} = $self->{active_fg}; 1830 $self->{fg} = $self->{active_fg};
1463 } 1831 }
1464 1832
1465 glEnable GL_BLEND;
1466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1467 glEnable GL_TEXTURE_2D; 1833 glEnable GL_TEXTURE_2D;
1468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469 glColor 0, 0, 0, 1; 1835 glColor 0, 0, 0, 1;
1470 1836
1471 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1837 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1472 1838
1473 glDisable GL_TEXTURE_2D; 1839 glDisable GL_TEXTURE_2D;
1474 glDisable GL_BLEND;
1475 1840
1476 $self->SUPER::_draw; 1841 $self->SUPER::_draw;
1477} 1842}
1478 1843
1479############################################################################# 1844#############################################################################
… …
1493 1858
1494 $class->SUPER::new ( 1859 $class->SUPER::new (
1495 padding => 2, 1860 padding => 2,
1496 fg => [1, 1, 1], 1861 fg => [1, 1, 1],
1497 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],
1498 state => 0, 1865 state => 0,
1499 can_hover => 1, 1866 can_hover => 1,
1500 @_ 1867 @_
1501 ) 1868 )
1502} 1869}
… …
1511 my ($self, $ev, $x, $y) = @_; 1878 my ($self, $ev, $x, $y) = @_;
1512 1879
1513 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1514 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1515 $self->{state} = !$self->{state}; 1882 $self->{state} = !$self->{state};
1516 $self->emit (changed => $self->{state}); 1883 $self->_emit (changed => $self->{state});
1517 } 1884 }
1518} 1885}
1519 1886
1520sub _draw { 1887sub _draw {
1521 my ($self) = @_; 1888 my ($self) = @_;
… …
1526 1893
1527 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;
1528 1895
1529 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1530 1897
1531 glEnable GL_BLEND; 1898 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899
1532 glEnable GL_TEXTURE_2D; 1900 glEnable GL_TEXTURE_2D;
1533 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1534
1535 my $tex = $self->{state} ? $tex[1] : $tex[0];
1536
1537 $tex->draw_quad (0, 0, $s, $s); 1901 $tex->draw_quad_alpha (0, 0, $s, $s);
1538
1539 glDisable GL_TEXTURE_2D; 1902 glDisable GL_TEXTURE_2D;
1540 glDisable GL_BLEND;
1541} 1903}
1542 1904
1543############################################################################# 1905#############################################################################
1544 1906
1545package CFClient::UI::Image; 1907package CFClient::UI::Image;
… …
1588 glTranslate 0, -$self->{w}, 0; 1950 glTranslate 0, -$self->{w}, 0;
1589 1951
1590 ($w, $h) = ($h, $w); 1952 ($w, $h) = ($h, $w);
1591 } 1953 }
1592 1954
1593 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595 glEnable GL_TEXTURE_2D; 1955 glEnable GL_TEXTURE_2D;
1596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1597 1957
1598 $tex->draw_quad (0, 0, $w, $h); 1958 $tex->draw_quad_alpha (0, 0, $w, $h);
1599 1959
1600 glDisable GL_BLEND;
1601 glDisable GL_TEXTURE_2D; 1960 glDisable GL_TEXTURE_2D;
1602} 1961}
1603 1962
1604############################################################################# 1963#############################################################################
1605 1964
1606package CFClient::UI::VGauge; 1965package CFClient::UI::VGauge;
1607 1966
1608our @ISA = CFClient::UI::Base::; 1967our @ISA = CFClient::UI::Base::;
1968
1969use List::Util qw(min max);
1609 1970
1610use CFClient::OpenGL; 1971use CFClient::OpenGL;
1611 1972
1612my %tex = ( 1973my %tex = (
1613 food => [ 1974 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1975 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1976 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1977 ],
1617 grace => [ 1978 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1979 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 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/
1620 ], 1981 ],
1621 hp => [ 1982 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1983 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1984 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1985 ],
1625 mana => [ 1986 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1987 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 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/
1628 ], 1989 ],
1629); 1990);
1630 1991
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 1992# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 1993sub new {
… …
1651} 2012}
1652 2013
1653sub set_max { 2014sub set_max {
1654 my ($self, $max) = @_; 2015 my ($self, $max) = @_;
1655 2016
2017 return if $self->{max_val} == $max;
2018
1656 $self->{max_val} = $max; 2019 $self->{max_val} = $max;
2020 $self->update;
1657} 2021}
1658 2022
1659sub set_value { 2023sub set_value {
1660 my ($self, $val, $max) = @_; 2024 my ($self, $val, $max) = @_;
1661 2025
1662 $self->set_max ($max) 2026 $self->set_max ($max)
1663 if defined $max; 2027 if defined $max;
1664 2028
1665 $max = $self->{max_val}; 2029 return if $self->{val} == $val;
2030
1666 $self->{val} = $val; 2031 $self->{val} = $val;
1667
1668 $self->update; 2032 $self->update;
1669} 2033}
1670 2034
1671sub _draw { 2035sub _draw {
1672 my ($self) = @_; 2036 my ($self) = @_;
1673 2037
1674 my $tex = $tex{$self->{type}}; 2038 my $tex = $tex{$self->{type}};
2039 my ($t1, $t2, $t3) = @$tex;
1675 2040
1676 my ($w, $h) = ($self->{w}, $self->{h}); 2041 my ($w, $h) = ($self->{w}, $self->{h});
1677 2042
1678 if ($self->{vertical}) { 2043 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 2044 glRotate 90, 0, 0, 1;
… …
1681 2046
1682 ($w, $h) = ($h, $w); 2047 ($w, $h) = ($h, $w);
1683 } 2048 }
1684 2049
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 2050 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 2051
1688 my $t1 = $tex->[0]; 2052 my $ycut1 = max 0, min 1, $ycut;
1689 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);
1690 2057
1691 glEnable GL_BLEND; 2058 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 2060 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 2062
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2063 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 2064 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 2065 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2066 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2067 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2068 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 2069 glEnd;
1706 2070
2071 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2072 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 2073 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2074 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2075 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2076 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2077 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 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 }
1714 2089
1715 glDisable GL_BLEND; 2090 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 2091 glDisable GL_TEXTURE_2D;
1717} 2092}
1718 2093
… …
1724 2099
1725sub new { 2100sub new {
1726 my ($class, %arg) = @_; 2101 my ($class, %arg) = @_;
1727 2102
1728 my $self = $class->SUPER::new ( 2103 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 2104 tooltip => $arg{type},
2105 can_hover => 1,
2106 can_events => 1,
1730 %arg, 2107 %arg,
1731 ); 2108 );
1732 2109
1733 $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");
1734 $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);
1735 $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");
1736 2113
1737 $self 2114 $self
1738} 2115}
1739 2116
… …
1742 2119
1743 $self->{value}->set_fontsize ($fsize); 2120 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 2121 $self->{max} ->set_fontsize ($fsize);
1745} 2122}
1746 2123
2124sub set_max {
2125 my ($self, $max) = @_;
2126
2127 $self->{gauge}->set_max ($max);
2128 $self->{max}->set_text ($max);
2129}
2130
1747sub set_value { 2131sub set_value {
1748 my ($self, $val, $max) = @_; 2132 my ($self, $val, $max) = @_;
1749 2133
1750 $self->set_max ($max) 2134 $self->set_max ($max)
1751 if defined $max; 2135 if defined $max;
1752 2136
1753 $self->{gauge}->set_value ($val, $max); 2137 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 2138 $self->{value}->set_text ($val);
1755}
1756
1757sub set_max {
1758 my ($self, $max) = @_;
1759
1760 $self->{gauge}->set_max ($max);
1761 $self->{max}->set_text ($max);
1762} 2139}
1763 2140
1764############################################################################# 2141#############################################################################
1765 2142
1766package CFClient::UI::Slider; 2143package CFClient::UI::Slider;
… …
1776 qw(s1_slider.png s1_slider_bg.png); 2153 qw(s1_slider.png s1_slider_bg.png);
1777 2154
1778sub new { 2155sub new {
1779 my $class = shift; 2156 my $class = shift;
1780 2157
1781 # range [value, low, high, page] 2158 # range [value, low, high, page, unit]
1782 2159
1783 # TODO: 0-width page 2160 # TODO: 0-width page
1784 # TODO: req_w/h are wrong with vertical 2161 # TODO: req_w/h are wrong with vertical
1785 # TODO: calculations are off 2162 # TODO: calculations are off
1786 my $self = $class->SUPER::new ( 2163 my $self = $class->SUPER::new (
1787 fg => [1, 1, 1], 2164 fg => [1, 1, 1],
1788 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],
1789 range => [0, 0, 100, 10], 2168 range => [0, 0, 100, 10, 0],
1790 req_w => 20, 2169 req_w => $::WIDTH / 80,
1791 req_h => 20, 2170 req_h => $::WIDTH / 80,
1792 vertical => 0, 2171 vertical => 0,
1793 can_hover => 1, 2172 can_hover => 1,
1794 inner_pad => 5, 2173 inner_pad => 0.02,
1795 @_ 2174 @_
1796 ); 2175 );
1797 2176
2177 $self->set_value ($self->{range}[0]);
2178 $self->update;
2179
1798 $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 }
1799} 2213}
1800 2214
1801sub size_request { 2215sub size_request {
1802 my ($self) = @_; 2216 my ($self) = @_;
1803 2217
… …
1809 2223
1810sub button_down { 2224sub button_down {
1811 my ($self, $ev, $x, $y) = @_; 2225 my ($self, $ev, $x, $y) = @_;
1812 2226
1813 $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
1814 $self->mouse_motion ($ev, $x, $y); 2231 $self->mouse_motion ($ev, $x, $y);
1815} 2232}
1816 2233
1817sub mouse_motion { 2234sub mouse_motion {
1818 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
1819 2236
1820 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
1821 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2254 my ($value, $lo, $hi, $page) = @{$self->{range}};
2255 my $range = ($hi - $page - $lo) || 1e-100;
1822 2256
1823 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2257 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1824 2258
1825 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2259 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1826 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2260 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1827 2261
1828 $x -= $inner_pad_px; # substract the padding 2262 $value = ($value - $lo) / $range;
1829 $x = $x * ($hi - $lo) / $inner_w + $lo; 2263 $value = $value * $self->{scale} + $self->{offset};
1830 $x = $lo if $x < $lo;
1831 $x = $hi - $page if $x > $hi - $page;
1832 $self->{range}[0] = $x;
1833 2264
1834 $self->emit (changed => $x); 2265 $self->{knob_x} = $value - $knob_w * 0.5;
1835 $self->update; 2266 $self->{knob_w} = $knob_w;
1836 } 2267 });
1837}
1838 2268
1839# the inner_* stuff is for generating a padding for the slider handle, 2269 $self->SUPER::update;
1840# so that the handle doesn't leave the texture. This calculation isn't 100%
1841# correct propably, but it does the job for now
1842sub _calc_inner_pad_px {
1843 my ($self, $w) = @_;
1844 ($w / 100) * $self->{inner_pad} # % to pixels
1845} 2270}
1846 2271
1847sub _draw { 2272sub _draw {
1848 my ($self) = @_; 2273 my ($self) = @_;
1849 2274
1850 $self->SUPER::_draw (); 2275 $self->SUPER::_draw ();
1851 2276
1852 my ($w, $h) = @$self{qw(w h)}; 2277 glScale $self->{w}, $self->{h};
1853 2278
1854 if ($self->{vertical}) { 2279 if ($self->{vertical}) {
1855 # draw a vertical slider like a rotated horizontal slider 2280 # draw a vertical slider like a rotated horizontal slider
1856 2281
2282 glTranslate 1, 0, 0;
1857 glRotate 90, 0, 0, 1; 2283 glRotate 90, 0, 0, 1;
1858 glTranslate 0, -$self->{w}, 0;
1859
1860 ($w, $h) = ($h, $w);
1861 } 2284 }
1862 2285
1863 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2286 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1864 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2287 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1865 2288
1866 my ($value, $lo, $hi, $page) = @{$self->{range}};
1867
1868 $hi = $value + 1 if $lo == $hi;
1869
1870 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1871 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1872
1873 $page = int $page * $inner_w / ($hi - $lo);
1874 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1875
1876 $w -= $page;
1877 $page &= ~1;
1878 glTranslate $page * 0.5, 0, 0;
1879 $page ||= 2;
1880
1881 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1882 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1883
1884 glEnable GL_BLEND;
1885 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1886 glEnable GL_TEXTURE_2D; 2289 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2290 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 2291
1889 # draw background 2292 # draw background
1890 $tex[1]->draw_quad (0, 0, $w, $h); 2293 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1891 2294
1892 # draw handle 2295 # draw handle
1893 $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);
1894 2297
1895 glDisable GL_BLEND;
1896 glDisable GL_TEXTURE_2D; 2298 glDisable GL_TEXTURE_2D;
1897} 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 (@_) }
1898 2341
1899############################################################################# 2342#############################################################################
1900 2343
1901package CFClient::UI::TextView; 2344package CFClient::UI::TextView;
1902 2345
… …
1906 2349
1907sub new { 2350sub new {
1908 my $class = shift; 2351 my $class = shift;
1909 2352
1910 my $self = $class->SUPER::new ( 2353 my $self = $class->SUPER::new (
1911 fontsize => 1, 2354 fontsize => 1,
2355 can_events => 0,
2356 #font => default_font
1912 @_, 2357 @_,
1913 2358
1914 layout => (new CFClient::Layout), 2359 layout => (new CFClient::Layout 1),
1915 par => [], 2360 par => [],
1916 height => 0, 2361 height => 0,
1917 children => [ 2362 children => [
1918 (new CFClient::UI::Empty expand => 1), 2363 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2364 (new CFClient::UI::Slider vertical => 1),
1920 ], 2365 ],
1921 ); 2366 );
1922 2367
1923 $self->{children}[1]->connect (changed => sub { 2368 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2369
1927 $self 2370 $self
1928} 2371}
1929 2372
1930sub set_fontsize { 2373sub set_fontsize {
… …
1932 2375
1933 $self->{fontsize} = $fontsize; 2376 $self->{fontsize} = $fontsize;
1934 $self->reflow; 2377 $self->reflow;
1935} 2378}
1936 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
1937sub text_height { 2392sub text_size {
1938 my ($self, $text) = @_; 2393 my ($self, $text, $indent) = @_;
1939 2394
1940 my $layout = $self->{layout}; 2395 my $layout = $self->{layout};
1941 2396
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2397 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2398 $layout->set_width ($self->{children}[0]{w} - $indent);
1944 $layout->set_text ($text); 2399 $layout->set_markup ($text);
1945 2400
1946 ($layout->size)[1] 2401 $layout->size
1947} 2402}
1948 2403
1949sub reflow { 2404sub reflow {
1950 my ($self) = @_; 2405 my ($self) = @_;
1951 2406
1952 $self->{need_reflow}++; 2407 $self->{need_reflow}++;
1953 $self->update; 2408 $self->update;
1954} 2409}
1955 2410
1956sub 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 {
1957 my ($self, $w, $h) = @_; 2419 my ($self) = @_;
1958 2420
1959 $self->SUPER::size_allocate ($w, $h); 2421 $self->{par} = [];
1960 2422 $self->{height} = 0;
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2423 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1962 $self->{layout}->set_width ($self->{children}[0]{w});
1963
1964 $self->reflow;
1965} 2424}
1966 2425
1967sub add_paragraph { 2426sub add_paragraph {
1968 my ($self, $color, $text) = @_; 2427 my ($self, $color, $text, $indent) = @_;
1969 2428
1970 #TODO: intelligently "reformat" paragraph 2429 for my $line (split /\n/, $text) {
1971 2430 my ($w, $h) = $self->text_size ($line);
1972 my $height = $self->text_height ($text);
1973
1974 $self->{height} += $height; 2431 $self->{height} += $h;
2432 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2433 }
1975 2434
1976 push @{$self->{par}}, [$height, $color, $text];
1977
1978 $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]);
1979 $self->{children}[1]->update;
1980} 2436}
1981 2437
1982sub update { 2438sub update {
1983 my ($self) = @_; 2439 my ($self) = @_;
1984 2440
… …
1986 2442
1987 return unless $self->{h} > 0; 2443 return unless $self->{h} > 0;
1988 2444
1989 delete $self->{texture}; 2445 delete $self->{texture};
1990 2446
1991 $ROOT->on_refresh ($self, sub { 2447 $ROOT->on_post_alloc ($self, sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449
1992 if (delete $self->{need_reflow}) { 2450 if (delete $self->{need_reflow}) {
1993 my $height = 0; 2451 my $height = 0;
1994 2452
1995 $height += $_->[0] = $self->text_height ($_->[2]) 2453 my $layout = $self->{layout};
2454
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
1996 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 }
1997 2468
1998 $self->{height} = $height; 2469 $self->{height} = $height;
1999 2470
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2001 2472
2002 delete $self->{texture}; 2473 delete $self->{texture};
2003 } 2474 }
2004 2475
2005 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2006 glClearColor 0, 0, 0, 1; 2477 glClearColor 0.5, 0.5, 0.5, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2478 glClear GL_COLOR_BUFFER_BIT;
2008 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
2009 glEnable GL_BLEND; 2491 glEnable GL_BLEND;
2492 #TODO# not correct in windows where rgba is forced off
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2493 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013
2014 my $top = int $self->{children}[1]{range}[0];
2015
2016 my $y0 = $top;
2017 my $y1 = $top + $self->{h};
2018
2019 my $y = 0;
2020
2021 my $layout = $self->{layout};
2022 2494
2023 for my $par (@{$self->{par}}) { 2495 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2496 my $h = $par->[1];
2025 2497
2026 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]);
2027 $layout->set_text ($par->[2]); 2501 $layout->set_markup ($par->[4]);
2028 2502
2029 glColor @{ $par->[1] }; 2503 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2030 my ($W, $H) = $layout->size; 2504
2031 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;
2032 } 2507 }
2033 2508
2034 $y += $h; 2509 $y += $h;
2035 } 2510 }
2036 2511
2037 glDisable GL_TEXTURE_2D;
2038 glDisable GL_BLEND; 2512 glDisable GL_BLEND;
2039 }; 2513 };
2040 }); 2514 });
2041} 2515}
2042 2516
2043sub _draw { 2517sub _draw {
2044 my ($self) = @_; 2518 my ($self) = @_;
2045 2519
2046 if ($self->{texture}) {
2047 glEnable GL_TEXTURE_2D; 2520 glEnable GL_TEXTURE_2D;
2048 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;
2049 $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});
2050 glDisable GL_TEXTURE_2D; 2524 glDisable GL_TEXTURE_2D;
2051 }
2052 2525
2053 $self->{children}[1]->draw; 2526 $self->{children}[1]->draw;
2054 2527
2055} 2528}
2056 2529
… …
2104 2577
2105sub new { 2578sub new {
2106 my $class = shift; 2579 my $class = shift;
2107 2580
2108 my $self = $class->SUPER::new ( 2581 my $self = $class->SUPER::new (
2109 state => 0, 2582 state => 0,
2110 connect_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2584 @_
2113 ); 2585 );
2114 2586
2115 if ($self->{state}) {
2116 $self->{state} = 0;
2117 $self->toggle_flopper;
2118 }
2119
2120 $self 2587 $self
2121} 2588}
2122 2589
2123sub toggle_flopper { 2590sub toggle_flopper {
2124 my ($self) = @_; 2591 my ($self) = @_;
2125 2592
2126 # TODO: use animation 2593 $self->{other}->toggle_visibility;
2127 if ($self->{state} = !$self->{state}) {
2128 $CFClient::UI::ROOT->add ($self->{other});
2129 $self->{other}->move ($self->coord2global (0, $self->{h}));
2130 $self->emit ("open");
2131 } else {
2132 $CFClient::UI::ROOT->remove ($self->{other});
2133 $self->emit ("close");
2134 }
2135
2136 $self->emit (changed => $self->{state});
2137} 2594}
2138 2595
2139############################################################################# 2596#############################################################################
2140 2597
2141package CFClient::UI::Tooltip; 2598package CFClient::UI::Tooltip;
… …
2151 @_, 2608 @_,
2152 can_events => 0, 2609 can_events => 0,
2153 ) 2610 )
2154} 2611}
2155 2612
2156sub set_text { 2613sub set_tooltip_from {
2157 my ($self, $text) = @_; 2614 my ($self, $widget) = @_;
2158 2615
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2616 $self->add (new CFClient::UI::Label
2160 $self->{label}->set_text ($text); 2617 markup => $widget->{tooltip},
2161 $self->add ($self->{label}); 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 );
2162} 2624}
2163 2625
2164sub size_request { 2626sub size_request {
2165 my ($self) = @_; 2627 my ($self) = @_;
2166 2628
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2629 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2630
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2631 ($w + 4, $h + 4)
2173} 2632}
2174 2633
2634sub size_allocate {
2635 my ($self, $w, $h) = @_;
2636
2637 $self->SUPER::size_allocate ($w - 4, $h - 4);
2638}
2639
2175sub _draw { 2640sub _draw {
2176 my ($self) = @_; 2641 my ($self) = @_;
2177 2642
2178 glPushMatrix;
2179 glTranslate 0.375, 0.375; 2643 glTranslate 0.375, 0.375;
2180 2644
2181 my ($w, $h) = @$self{qw(w h)}; 2645 my ($w, $h) = @$self{qw(w h)};
2182 2646
2183 glColor 1, 0.8, 0.4; 2647 glColor 1, 0.8, 0.4;
… …
2194 glVertex 0 , $h; 2658 glVertex 0 , $h;
2195 glVertex $w, $h; 2659 glVertex $w, $h;
2196 glVertex $w, 0; 2660 glVertex $w, 0;
2197 glEnd; 2661 glEnd;
2198 2662
2199 glPopMatrix; 2663 glTranslate 2 - 0.375, 2 - 0.375;
2200
2201 glTranslate 2, 2;
2202 $self->SUPER::_draw; 2664 $self->SUPER::_draw;
2203} 2665}
2204 2666
2205############################################################################# 2667#############################################################################
2206 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
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};
2945 } else {
2946 $self->{item}{$group} = {
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 };
2956 }
2957
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;
2969}
2970
2971#############################################################################
2972
2207package CFClient::UI::Root; 2973package CFClient::UI::Root;
2208 2974
2209our @ISA = CFClient::UI::Container::; 2975our @ISA = CFClient::UI::Container::;
2210 2976
2211use CFClient::OpenGL; 2977use CFClient::OpenGL;
2212 2978
2213sub check_size { 2979sub new {
2214 my ($self) = @_; 2980 my $class = shift;
2215 2981
2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2982 $class->SUPER::new (
2217} 2983 visible => 1,
2218 2984 @_,
2219sub size_request { 2985 )
2220 ($::WIDTH, $::HEIGHT)
2221} 2986}
2222 2987
2223sub configure { 2988sub configure {
2224 my ($self, $x, $y, $w, $h) = @_; 2989 my ($self, $x, $y, $w, $h) = @_;
2225 2990
2226 $self->SUPER::configure ($x, $y, $w, $h); 2991 $self->{w} = $w;
2992 $self->{h} = $h;
2993}
2227 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
2228 for my $child (@{$self->{children}}) { 3011 for my $child ($self->children) {
2229 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)};
2230 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
2231 $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;
2232 $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
2233 $child->configure ($X, $Y, $W,$H); 3025 $child->configure ($X, $Y, $W, $H);
2234 } 3026 }
2235} 3027}
2236 3028
2237sub _topleft { 3029sub coord2local {
2238 my ($self, $x, $y) = @_; 3030 my ($self, $x, $y) = @_;
2239 3031
2240 ($x, $y) 3032 ($x, $y)
2241} 3033}
2242 3034
3035sub coord2global {
3036 my ($self, $x, $y) = @_;
3037
3038 ($x, $y)
3039}
3040
2243sub update { 3041sub update {
2244 my ($self) = @_; 3042 my ($self) = @_;
2245 3043
2246 $self->check_size; 3044 $self->check_size;
2247 ::refresh (); 3045 $::WANT_REFRESH++;
2248} 3046}
2249 3047
2250sub add { 3048sub add {
2251 my ($self, $child) = @_; 3049 my ($self, @children) = @_;
2252 3050
3051 for my $child (@children) {
3052 $child->{is_toplevel} = 1;
3053
2253 # integerize window positions 3054 # integerise window positions
2254 $child->{x} = int $child->{x}; 3055 $child->{x} = int $child->{x};
2255 $child->{y} = int $child->{y}; 3056 $child->{y} = int $child->{y};
3057 }
2256 3058
2257 $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 }
2258} 3078}
2259 3079
2260sub on_refresh { 3080sub on_refresh {
2261 my ($self, $id, $cb) = @_; 3081 my ($self, $id, $cb) = @_;
2262 3082
2263 $self->{refresh_hook}{$id} = $cb; 3083 $self->{refresh_hook}{$id} = $cb;
2264} 3084}
2265 3085
3086sub on_post_alloc {
3087 my ($self, $id, $cb) = @_;
3088
3089 $self->{post_alloc_hook}{$id} = $cb;
3090}
3091
2266sub draw { 3092sub draw {
2267 my ($self) = @_; 3093 my ($self) = @_;
2268 3094
2269 while (my $rcb = delete $self->{refresh_hook}) { 3095 while ($self->{refresh_hook}) {
2270 $_->() 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}};
2271 } 3153 }
2272 3154
2273 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3155 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2274 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3156 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2275 glClear GL_COLOR_BUFFER_BIT; 3157 glClear GL_COLOR_BUFFER_BIT;
2276 3158
2277 glMatrixMode GL_PROJECTION; 3159 glMatrixMode GL_PROJECTION;
2278 glLoadIdentity; 3160 glLoadIdentity;
2279 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3161 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2280 glMatrixMode GL_MODELVIEW; 3162 glMatrixMode GL_MODELVIEW;
2281 glLoadIdentity; 3163 glLoadIdentity;
2282 3164
2283 $self->_draw; 3165 $self->_draw;
2284} 3166}
… …
2286############################################################################# 3168#############################################################################
2287 3169
2288package CFClient::UI; 3170package CFClient::UI;
2289 3171
2290$ROOT = new CFClient::UI::Root; 3172$ROOT = new CFClient::UI::Root;
2291$TOOLTIP = new CFClient::UI::Tooltip; 3173$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2292 3174
22931 31751
2294 3176

Diff Legend

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