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.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.239 by root, Thu May 25 22:29:57 2006 UTC

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

Diff Legend

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