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

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

Diff Legend

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