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.169 by elmex, Mon Apr 24 10:43:39 2006 UTC vs.
Revision 1.250 by root, Sun May 28 02:31:03 2006 UTC

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

Diff Legend

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