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.231 by root, Thu May 25 00:26:19 2006 UTC

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

Diff Legend

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