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.154 by root, Sun Apr 23 02:20:57 2006 UTC vs.
Revision 1.246 by root, Sun May 28 00:40:51 2006 UTC

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

Diff Legend

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