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

Diff Legend

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