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

Diff Legend

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