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

Diff Legend

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