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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.167 by elmex, Mon Apr 24 08:44:23 2006 UTC vs.
Revision 1.246 by root, Sun May 28 00:40:51 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines