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.186 by root, Mon May 8 20:39:34 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
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48} 51}
49 52
50# class methods for events 53# class methods for events
51sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 56 if $FOCUS;
54} 57}
55 58
56sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 61 if $FOCUS;
59} 62}
60 63
61sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
62 my ($ev) = @_; 65 my ($ev) = @_;
… …
71 check_tooltip; 74 check_tooltip;
72 } 75 }
73 76
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 78
76 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 81}
81 82
82sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
83 my ($ev) = @_; 84 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
85 86
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 88
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 90
90 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 93
95 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 96 $grab->update if $grab;
98 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 114
116 check_tooltip; 115 check_tooltip;
117 } 116 }
118 117
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 119 if $HOVER;
123} 120}
124 121
125# convert position array to integers 122# convert position array to integers
126sub harmonize { 123sub harmonize {
127 my ($vals) = @_; 124 my ($vals) = @_;
… …
131 for (@$vals) { 128 for (@$vals) {
132 my $i = int $_ + $rem; 129 my $i = int $_ + $rem;
133 $rem += $_ - $i; 130 $rem += $_ - $i;
134 $_ = $i; 131 $_ = $i;
135 } 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;
136} 169}
137 170
138############################################################################# 171#############################################################################
139 172
140package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
158 if (/^connect_(.*)$/) { 191 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 192 $self->connect ($1 => delete $self->{$_});
160 } 193 }
161 } 194 }
162 195
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197
163 $self 198 $self
164} 199}
165 200
166sub destroy { 201sub destroy {
167 my ($self) = @_; 202 my ($self) = @_;
… …
170 %$self = (); 205 %$self = ();
171} 206}
172 207
173sub show { 208sub show {
174 my ($self) = @_; 209 my ($self) = @_;
175
176 return if $self->{parent}; 210 return if $self->{parent};
177 211
178 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
179} 213}
180 214
181sub hide { 215sub show_centered {
182 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};
183 234
184 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
185 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;
186 245
187 $self->{parent}->remove ($self) 246 $self->{parent}->remove ($self)
188 if $self->{parent}; 247 if $self->{parent};
189} 248}
190 249
… …
232 $self->{y} = $y; 291 $self->{y} = $y;
233 $self->update; 292 $self->update;
234 } 293 }
235 294
236 if ($self->{w} != $w || $self->{h} != $h) { 295 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 296 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 297 }
244} 298}
245 299
246sub size_allocate { 300sub size_allocate {
247 # nothing to be done 301 # nothing to be done
248} 302}
249 303
304sub reconfigure {
305 my ($self) = @_;
306
307 $self->check_size (1);
308 $self->update;
309}
310
250sub children { 311sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263} 312}
264 313
265sub set_max_size { 314sub set_max_size {
266 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
267 316
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 317 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 318 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 319}
271 320
272# return top left coordinates 321sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 322 my ($self, $tooltip) = @_;
275 323
276 $self->{parent} 324 $self->{tooltip} = $tooltip;
277 or Carp::confess "no parent widget in _topleft\n";#d#
278 325
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 326 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner};
328 CFClient::UI::check_tooltip;
329 }
280} 330}
281 331
282# translate global coordinates to local coordinate system 332# translate global coordinates to local coordinate system
283sub coord2local { 333sub coord2local {
284 my ($self, $x, $y) = @_; 334 my ($self, $x, $y) = @_;
285 335
286 my ($X, $Y) = $self->_topleft; 336 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 337}
289 338
290# translate local coordinates to global coordinate system 339# translate local coordinates to global coordinate system
291sub coord2global { 340sub coord2global {
292 my ($self, $x, $y) = @_; 341 my ($self, $x, $y) = @_;
293 342
294 my ($X, $Y) = $self->_topleft; 343 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 344}
297 345
298sub focus_in { 346sub focus_in {
299 my ($self) = @_; 347 my ($self) = @_;
300 348
301 return if $FOCUS == $self; 349 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 350 return unless $self->{can_focus};
303 351
304 my $focus = $FOCUS; $FOCUS = $self; 352 my $focus = $FOCUS; $FOCUS = $self;
305 353
306 $self->emit (focus_in => $focus); 354 $self->_emit (focus_in => $focus);
307 355
308 $focus->update if $focus; 356 $focus->update if $focus;
309 $FOCUS->update; 357 $FOCUS->update;
310} 358}
311 359
… …
314 362
315 return unless $FOCUS == $self; 363 return unless $FOCUS == $self;
316 364
317 my $focus = $FOCUS; undef $FOCUS; 365 my $focus = $FOCUS; undef $FOCUS;
318 366
319 $self->emit (focus_out => $focus); 367 $self->_emit (focus_out => $focus);
320 368
321 $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;
322} 373}
323 374
324sub mouse_motion { } 375sub mouse_motion { }
325sub button_up { } 376sub button_up { }
326sub key_down { } 377sub key_down { }
327sub key_up { } 378sub key_up { }
328 379
329sub button_down { 380sub button_down {
330 my ($self, $ev, $x, $y) = @_; 381 my ($self, $ev, $x, $y) = @_;
331 382
332 $self->focus_in; 383 $self->focus_in;
… …
372 glVertex $self->{w}, 0; 423 glVertex $self->{w}, 0;
373 glVertex $self->{w}, $self->{h}; 424 glVertex $self->{w}, $self->{h};
374 glVertex 0 , $self->{h}; 425 glVertex 0 , $self->{h};
375 glEnd; 426 glEnd;
376 glPopMatrix; 427 glPopMatrix;
377 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;
378 } 429 }
379} 430}
380 431
381sub _draw { 432sub _draw {
382 my ($self) = @_; 433 my ($self) = @_;
… …
398 449
399sub set_parent { 450sub set_parent {
400 my ($self, $parent) = @_; 451 my ($self, $parent) = @_;
401 452
402 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;
403} 460}
404 461
405sub check_size { 462sub check_size {
406 my ($self) = @_; 463 my ($self, $forced) = @_;
407 464
408 $self->{parent} 465 $self->{force_alloc} = 1 if $forced;
409 or return 1; 466 $CFClient::UI::ROOT->{check_size}{$self} = $self;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429} 467}
430 468
431sub update { 469sub update {
432 my ($self) = @_; 470 my ($self) = @_;
433 471
… …
439 my ($self, $signal, $cb) = @_; 477 my ($self, $signal, $cb) = @_;
440 478
441 push @{ $self->{signal_cb}{$signal} }, $cb; 479 push @{ $self->{signal_cb}{$signal} }, $cb;
442} 480}
443 481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
444sub emit { 488sub emit {
445 my ($self, $signal, @args) = @_; 489 my ($self, $signal, @args) = @_;
446 490
447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
448} 493}
449 494
450sub DESTROY { 495sub DESTROY {
451 my ($self) = @_; 496 my ($self) = @_;
452 497
498 delete $WIDGET{$self+0};
453 #$self->deactivate; 499 #$self->deactivate;
454} 500}
455 501
456############################################################################# 502#############################################################################
457 503
… …
466 my $class = shift; 512 my $class = shift;
467 513
468 # range [value, low, high, page] 514 # range [value, low, high, page]
469 515
470 $class->SUPER::new ( 516 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 517 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 518 #active_bg => [1, 1, 1, 0.5],
473 @_ 519 @_
474 ) 520 )
475} 521}
476 522
477sub _draw { 523sub _draw {
478 my ($self) = @_; 524 my ($self) = @_;
479 525
526 my $color = $FOCUS == $self && $self->{active_bg}
527 ? $self->{active_bg}
528 : $self->{bg};
529
530 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 531 my ($w, $h) = @$self{qw(w h)};
481 532
482 glEnable GL_BLEND; 533 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 535 glColor @$color;
485 536
486 glBegin GL_QUADS; 537 glBegin GL_QUADS;
487 glVertex 0 , 0; 538 glVertex 0 , 0;
488 glVertex 0 , $h; 539 glVertex 0 , $h;
489 glVertex $w, $h; 540 glVertex $w, $h;
490 glVertex $w, 0; 541 glVertex $w, 0;
491 glEnd; 542 glEnd;
492 543
493 glDisable GL_BLEND; 544 glDisable GL_BLEND;
545 }
494} 546}
495 547
496############################################################################# 548#############################################################################
497 549
498package CFClient::UI::Empty; 550package CFClient::UI::Empty;
… …
530 582
531 $self 583 $self
532} 584}
533 585
534sub add { 586sub add {
535 my ($self, $child) = @_; 587 my ($self, @widgets) = @_;
536 588
537 $child->set_parent ($self); 589 $_->set_parent ($self)
590 for @widgets;
538 591
539 use sort 'stable'; 592 use sort 'stable';
540 593
541 $self->{children} = [ 594 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 595 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 596 @{$self->{children}}, @widgets
544 ]; 597 ];
545 598
546 $child->check_size; 599 $self->check_size (1);
547 $self->update; 600 $self->update;
548} 601}
549 602
550sub children { 603sub children {
551 @{ $_[0]{children} } 604 @{ $_[0]{children} }
… …
658} 711}
659 712
660sub update { 713sub update {
661 my ($self) = @_; 714 my ($self) = @_;
662 715
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 716 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 717 $self->SUPER::update;
665} 718}
666 719
667sub size_allocate { 720sub size_allocate {
668 my ($self, $w, $h) = @_; 721 my ($self, $w, $h) = @_;
… …
681 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 734 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
682 glClearColor 0, 0, 0, 0; 735 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT; 736 glClear GL_COLOR_BUFFER_BIT;
684 737
685 $self->_render; 738 $self->_render;
686# glColorMask 1, 1, 1, 0;
687# glEnable GL_BLEND;
688# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689# glRasterPos 0, 0;
690# glCopyPixels 0, 0, $self->{w}, $self->{h};
691# glDisable GL_BLEND;
692# glColorMask 1, 1, 1, 1;
693 }; 739 };
694} 740}
695 741
696sub _draw { 742sub _draw {
697 my ($self) = @_; 743 my ($self) = @_;
… …
699 my ($w, $h) = ($self->w, $self->h); 745 my ($w, $h) = ($self->w, $self->h);
700 746
701 my $tex = $self->{texture} 747 my $tex = $self->{texture}
702 or return; 748 or return;
703 749
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 750 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 752 glColor 1, 1, 1, 1;
709 753
710 $tex->draw_quad (0, 0, $w, $h); 754 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 755
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 756 glDisable GL_TEXTURE_2D;
714} 757}
715 758
716############################################################################# 759#############################################################################
717 760
… …
721 764
722sub size_request { 765sub size_request {
723 my ($self) = @_; 766 my ($self) = @_;
724 767
725 @$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)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 769
728 @$self{qw(child_w child_h)} 770 @$self{qw(child_w child_h)}
729} 771}
730 772
731sub size_allocate { 773sub size_allocate {
732 my ($self, $w, $h) = @_; 774 my ($self, $w, $h) = @_;
733 775
776 my ($cw, $ch) = @$self{qw(child_w child_h)};
777# $w = $self->{w};
778 $self->child->configure (0, 0, $cw, $ch);
734 $self->update; 779 $self->update;
735} 780}
736 781
737sub set_offset { 782sub set_offset {
738 my ($self, $x, $y) = @_; 783 my ($self, $x, $y) = @_;
… …
741 $self->{view_y} = int $y; 786 $self->{view_y} = int $y;
742 787
743 $self->update; 788 $self->update;
744} 789}
745 790
746# hmm, this does not work for topleft of $self... but we should not aks for that 791# hmm, this does not work for topleft of $self... but we should not ask for that
747sub _topleft { 792sub coord2local {
748 my ($self, $x, $y) = @_; 793 my ($self, $x, $y) = @_;
749 794
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 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)
751} 805}
752 806
753sub find_widget { 807sub find_widget {
754 my ($self, $x, $y) = @_; 808 my ($self, $x, $y) = @_;
755 809
… …
783 837
784 my $slider = new CFClient::UI::Slider 838 my $slider = new CFClient::UI::Slider
785 vertical => 1, 839 vertical => 1,
786 range => [0, 0, 1, 0.01], # HACK fix 840 range => [0, 0, 1, 0.01], # HACK fix
787 connect_changed => sub { 841 connect_changed => sub {
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 842 $self->{vp}->set_offset (0, $_[1]);
789 }, 843 },
790 ; 844 ;
791 845
792 $self = $class->SUPER::new ( 846 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort), 847 vp => (new CFClient::UI::ViewPort expand => 1),
794 slider => $slider, 848 slider => $slider,
795 @_, 849 @_,
796 ); 850 );
797 851
798 $self->{vp}->add ($self->{scrolled}); 852 $self->{vp}->add ($self->{scrolled});
… …
800 $self->add ($self->{slider}); 854 $self->add ($self->{slider});
801 855
802 $self 856 $self
803} 857}
804 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
805#TODO# update range on size_allocate depeneing on child 868#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 869# update viewport offset on scroll
807 870
808############################################################################# 871#############################################################################
809 872
810package CFClient::UI::Frame; 873package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 877use CFClient::OpenGL;
815 878
816sub new { 879sub new {
817 my $class = shift; 880 my $class = shift;
818 881
819 my $self = $class->SUPER::new ( 882 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 883 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 884 @_,
824 ); 885 )
825
826 $self
827} 886}
828 887
829sub _draw { 888sub _draw {
830 my ($self) = @_; 889 my ($self) = @_;
831 890
832 my ($w, $h) = ($self->{w}, $self->{h}); 891 if ($self->{bg}) {
892 my ($w, $h) = @$self{qw(w h)};
833 893
834 glEnable GL_BLEND; 894 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 896 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 897
839# glBegin GL_QUADS; 898 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 899 glVertex 0 , 0;
842# glVertex 0 , $h; 900 glVertex 0 , $h;
843# glVertex $w, $h; 901 glVertex $w, $h;
844# glVertex $w, 0; 902 glVertex $w, 0;
845# glEnd; 903 glEnd;
846 904
847
848 $self->child->draw;
849 glDisable GL_BLEND; 905 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 906 }
907
908 $self->SUPER::_draw;
851} 909}
852 910
853############################################################################# 911#############################################################################
854 912
855package CFClient::UI::FancyFrame; 913package CFClient::UI::FancyFrame;
… …
866 my $class = shift; 924 my $class = shift;
867 925
868 # TODO: user_x, user_y, overwrite moveto? 926 # TODO: user_x, user_y, overwrite moveto?
869 927
870 my $self = $class->SUPER::new ( 928 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 929 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 930 border_bg => [1, 1, 1, 1],
873 border => 0.6, 931 border => 0.6,
932 is_toplevel => 1,
874 can_events => 1, 933 can_events => 1,
875 @_ 934 @_
876 ); 935 );
877 936
878 $self->{title} &&= new CFClient::UI::Label 937 $self->{title} &&= new CFClient::UI::Label
879 align => 0, 938 align => 0,
… …
903 my ($self, $w, $h) = @_; 962 my ($self, $w, $h) = @_;
904 963
905 $h -= List::Util::max 0, $self->border * 2; 964 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 965 $w -= List::Util::max 0, $self->border * 2;
907 966
908 $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)
909 if $self->{title}; 968 if $self->{title};
910 969
911 $self->child->configure ($self->border, $self->border, $w, $h); 970 $self->child->configure ($self->border, $self->border, $w, $h);
912} 971}
913 972
… …
971 my ($self) = @_; 1030 my ($self) = @_;
972 1031
973 my ($w, $h ) = ($self->{w}, $self->{h}); 1032 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1033 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 1034
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 1035 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 1037
981 my $border = $self->border; 1038 my $border = $self->border;
982 1039
983 glColor @{ $self->{border_bg} }; 1040 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 1041 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 1042 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1043 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1044 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988 1045
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1046 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 1047 my $bg = $tex[0];
991 1048
992 # TODO: repeat texture not scale 1049 # TODO: repeat texture not scale
… …
996 glColor @{ $self->{bg} }; 1053 glColor @{ $self->{bg} };
997 1054
998 $bg->{s} = $rep_x; 1055 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y; 1056 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1; 1057 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 1058 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059 }
1002 1060
1003 glDisable GL_TEXTURE_2D; 1061 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1062
1007 $self->{title}->draw if $self->{title}; 1063 $self->{title}->draw if $self->{title};
1008 1064
1009 $self->child->draw; 1065 $self->child->draw;
1010} 1066}
… …
1237} 1293}
1238 1294
1239sub size_allocate { 1295sub size_allocate {
1240 my ($self, $w, $h) = @_; 1296 my ($self, $w, $h) = @_;
1241 1297
1298 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1299
1242 my $children = $self->{children}; 1300 my $children = $self->{children};
1243 1301
1244 my @h = map $_->{req_h}, @$children; 1302 my @h = map $_->{req_h}, @$children;
1245 1303
1246 my $req_h = List::Util::sum @h; 1304 my $req_h = List::Util::sum @h;
… …
1275 1333
1276############################################################################# 1334#############################################################################
1277 1335
1278package CFClient::UI::Label; 1336package CFClient::UI::Label;
1279 1337
1280our @ISA = CFClient::UI::Base::; 1338our @ISA = CFClient::UI::DrawBG::;
1281 1339
1282use CFClient::OpenGL; 1340use CFClient::OpenGL;
1283 1341
1284sub new { 1342sub new {
1285 my ($class, %arg) = @_; 1343 my ($class, %arg) = @_;
1286 1344
1287 my $self = $class->SUPER::new ( 1345 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1346 fg => [1, 1, 1],
1347 #bg => none
1348 #active_bg => none
1289 #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),
1290 fontsize => 1, 1355 fontsize => 1,
1291 text => "",
1292 align => -1, 1356 align => -1,
1293 valign => -1, 1357 valign => -1,
1294 padding => 2, 1358 padding => 2,
1295 layout => new CFClient::Layout,
1296 can_events => 0, 1359 can_events => 0,
1297 %arg 1360 %arg
1298 ); 1361 );
1299 1362
1300 if (exists $self->{template}) { 1363 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1364 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1365 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1366 $self->{template} = $layout;
1304 } 1367 }
1305 1368
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1369 if (exists $self->{markup}) {
1307 $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 }
1308 1374
1309 $self 1375 $self
1310} 1376}
1311 1377
1312sub escape { 1378sub escape($) {
1313 local $_ = $_[1]; 1379 local $_ = $_[0];
1314 1380
1315 s/&/&amp;/g; 1381 s/&/&amp;/g;
1316 s/>/&gt;/g; 1382 s/>/&gt;/g;
1317 s/</&lt;/g; 1383 s/</&lt;/g;
1318 1384
1319 $_[1] 1385 $_
1320} 1386}
1321 1387
1322sub update { 1388sub update {
1323 my ($self) = @_; 1389 my ($self) = @_;
1324 1390
… …
1330 my ($self, $text) = @_; 1396 my ($self, $text) = @_;
1331 1397
1332 return if $self->{text} eq "T$text"; 1398 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1399 $self->{text} = "T$text";
1334 1400
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1402 $self->{layout}->set_text ($text);
1336 1403
1337 delete $self->{texture};
1338 $self->update; 1404 $self->update;
1339 $self->check_size; 1405 $self->check_size;
1340} 1406}
1341 1407
1342sub set_markup { 1408sub set_markup {
1343 my ($self, $markup) = @_; 1409 my ($self, $markup) = @_;
1344 1410
1345 return if $self->{text} eq "M$markup"; 1411 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1412 $self->{text} = "M$markup";
1347 1413
1414 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415
1416 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1417 $self->{layout}->set_markup ($markup);
1349 1418
1350 delete $self->{texture};
1351 $self->update; 1419 $self->update;
1352 $self->check_size; 1420 $self->check_size;
1353} 1421}
1354 1422
1355sub size_request { 1423sub size_request {
1356 my ($self) = @_; 1424 my ($self) = @_;
1357 1425
1358 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $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});
1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361 1431
1362 my ($w, $h) = $self->{layout}->size; 1432 my ($w, $h) = $self->{layout}->size;
1363 1433
1364 if (exists $self->{template}) { 1434 if (exists $self->{template}) {
… …
1394} 1464}
1395 1465
1396sub _draw { 1466sub _draw {
1397 my ($self) = @_; 1467 my ($self) = @_;
1398 1468
1469 $self->SUPER::_draw; # draw background, if applicable
1470
1399 my $tex = $self->{texture} ||= do { 1471 my $tex = $self->{texture} ||= do {
1472 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1473 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $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});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1477 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478
1403 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
1404 }; 1490 };
1405 1491
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1492 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1494
1495 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1496 glColor @{$self->{fg}};
1412
1413 $self->{ox} = int (
1414 $self->{align} < 0 ? $self->{padding}
1415 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416 : ($self->{w} - $tex->{w}) * 0.5
1417 );
1418
1419 $self->{oy} = int (
1420 $self->{valign} < 0 ? $self->{padding}
1421 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422 : ($self->{h} - $tex->{h}) * 0.5
1423 );
1424
1425 $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 }
1426 1501
1427 glDisable GL_TEXTURE_2D; 1502 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1503}
1430 1504
1431############################################################################# 1505#############################################################################
1432 1506
1433package CFClient::UI::EntryBase; 1507package CFClient::UI::EntryBase;
… …
1446 active_fg => [0, 0, 0], 1520 active_fg => [0, 0, 0],
1447 can_hover => 1, 1521 can_hover => 1,
1448 can_focus => 1, 1522 can_focus => 1,
1449 valign => 0, 1523 valign => 0,
1450 can_events => 1, 1524 can_events => 1,
1525 #text => ...
1451 @_ 1526 @_
1452 ) 1527 )
1453} 1528}
1454 1529
1455sub _set_text { 1530sub _set_text {
… …
1465 $self->{text} = $text; 1540 $self->{text} = $text;
1466 1541
1467 $text =~ s/./*/g if $self->{hidden}; 1542 $text =~ s/./*/g if $self->{hidden};
1468 $self->{layout}->set_text ("$text "); 1543 $self->{layout}->set_text ("$text ");
1469 1544
1470 $self->emit (changed => $self->{text}); 1545 $self->_emit (changed => $self->{text});
1471}
1472
1473sub get_text {
1474 $_[0]{text}
1475}
1476
1477sub size_request {
1478 my ($self) = @_;
1479
1480 my ($w, $h) = $self->SUPER::size_request;
1481
1482 ($w + 1, $h) # add 1 for cursor
1483}
1484
1485sub size_allocate {
1486 my ($self, $w, $h) = @_;
1487
1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489} 1546}
1490 1547
1491sub set_text { 1548sub set_text {
1492 my ($self, $text) = @_; 1549 my ($self, $text) = @_;
1493 1550
1494 $self->{cursor} = length $text; 1551 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1552 $self->_set_text ($text);
1496 $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
1497} 1573}
1498 1574
1499sub key_down { 1575sub key_down {
1500 my ($self, $ev) = @_; 1576 my ($self, $ev) = @_;
1501 1577
… …
1503 my $sym = $ev->{sym}; 1579 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1580 my $uni = $ev->{unicode};
1505 1581
1506 my $text = $self->get_text; 1582 my $text = $self->get_text;
1507 1583
1508 if ($sym == 8) { 1584 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1585 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1586 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1587 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1588 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1589 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1590 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1591 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1592 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1593 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1594 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1595 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1596 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1597 $self->_emit ('escape');
1522 } elsif ($uni) { 1598 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1599 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1600 }
1525 1601
1526 $self->_set_text ($text); 1602 $self->_set_text ($text);
1527 $self->update; 1603 $self->update;
1604 $self->check_size;
1528} 1605}
1529 1606
1530sub focus_in { 1607sub focus_in {
1531 my ($self) = @_; 1608 my ($self) = @_;
1532 1609
… …
1612 if ($sym == 13) { 1689 if ($sym == 13) {
1613 unshift @{$self->{history}}, 1690 unshift @{$self->{history}},
1614 my $txt = $self->get_text; 1691 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1; 1692 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = ''; 1693 $self->{history_saveback} = '';
1617 $self->emit (activate => $txt); 1694 $self->_emit (activate => $txt);
1618 $self->update; 1695 $self->update;
1619 1696
1620 } elsif ($sym == CFClient::SDLK_UP) { 1697 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) { 1698 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text; 1699 $self->{history_saveback} = $self->get_text;
… …
1661 my $class = shift; 1738 my $class = shift;
1662 1739
1663 $class->SUPER::new ( 1740 $class->SUPER::new (
1664 padding => 4, 1741 padding => 4,
1665 fg => [1, 1, 1], 1742 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1743 active_fg => [0, 0, 1],
1668 can_hover => 1, 1744 can_hover => 1,
1669 align => 0, 1745 align => 0,
1670 valign => 0, 1746 valign => 0,
1671 can_events => 1, 1747 can_events => 1,
1672 @_ 1748 @_
1673 ) 1749 )
1674} 1750}
1675 1751
1752sub activate { }
1753
1676sub button_up { 1754sub button_up {
1677 my ($self, $ev, $x, $y) = @_; 1755 my ($self, $ev, $x, $y) = @_;
1678 1756
1757 $self->emit ("activate")
1679 if ($x >= 0 && $x < $self->{w} 1758 if $x >= 0 && $x < $self->{w}
1680 && $y >= 0 && $y < $self->{h}) { 1759 && $y >= 0 && $y < $self->{h};
1681 $self->emit ("activate");
1682 }
1683} 1760}
1684 1761
1685sub _draw { 1762sub _draw {
1686 my ($self) = @_; 1763 my ($self) = @_;
1687 1764
… …
1689 1766
1690 if ($GRAB == $self) { 1767 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1768 $self->{fg} = $self->{active_fg};
1692 } 1769 }
1693 1770
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1771 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1773 glColor 0, 0, 0, 1;
1699 1774
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1775 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1776
1702 glDisable GL_TEXTURE_2D; 1777 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1778
1705 $self->SUPER::_draw; 1779 $self->SUPER::_draw;
1706} 1780}
1707 1781
1708############################################################################# 1782#############################################################################
… …
1722 1796
1723 $class->SUPER::new ( 1797 $class->SUPER::new (
1724 padding => 2, 1798 padding => 2,
1725 fg => [1, 1, 1], 1799 fg => [1, 1, 1],
1726 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],
1727 state => 0, 1803 state => 0,
1728 can_hover => 1, 1804 can_hover => 1,
1729 @_ 1805 @_
1730 ) 1806 )
1731} 1807}
… …
1740 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1741 1817
1742 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1743 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1744 $self->{state} = !$self->{state}; 1820 $self->{state} = !$self->{state};
1745 $self->emit (changed => $self->{state}); 1821 $self->_emit (changed => $self->{state});
1746 } 1822 }
1747} 1823}
1748 1824
1749sub _draw { 1825sub _draw {
1750 my ($self) = @_; 1826 my ($self) = @_;
… …
1755 1831
1756 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;
1757 1833
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1834 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1835
1760 glEnable GL_BLEND; 1836 my $tex = $self->{state} ? $tex[1] : $tex[0];
1837
1761 glEnable GL_TEXTURE_2D; 1838 glEnable GL_TEXTURE_2D;
1762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764 my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766 $tex->draw_quad (0, 0, $s, $s); 1839 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1841}
1771 1842
1772############################################################################# 1843#############################################################################
1773 1844
1774package CFClient::UI::Image; 1845package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1888 glTranslate 0, -$self->{w}, 0;
1818 1889
1819 ($w, $h) = ($h, $w); 1890 ($w, $h) = ($h, $w);
1820 } 1891 }
1821 1892
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1893 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1895
1827 $tex->draw_quad (0, 0, $w, $h); 1896 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1897
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1898 glDisable GL_TEXTURE_2D;
1831} 1899}
1832 1900
1833############################################################################# 1901#############################################################################
1834 1902
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2091 qw(s1_slider.png s1_slider_bg.png);
2024 2092
2025sub new { 2093sub new {
2026 my $class = shift; 2094 my $class = shift;
2027 2095
2028 # range [value, low, high, page] 2096 # range [value, low, high, page, unit]
2029 2097
2030 # TODO: 0-width page 2098 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2099 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2100 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2101 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2102 fg => [1, 1, 1],
2035 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],
2036 range => [0, 0, 100, 10], 2106 range => [0, 0, 100, 10, 0],
2037 req_w => $::WIDTH / 80, 2107 req_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2108 req_h => $::WIDTH / 80,
2039 vertical => 0, 2109 vertical => 0,
2040 can_hover => 1, 2110 can_hover => 1,
2041 inner_pad => 5, 2111 inner_pad => 0.02,
2042 @_ 2112 @_
2043 ); 2113 );
2044 2114
2115 $self->set_value ($self->{range}[0]);
2116 $self->update;
2117
2045 $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 }
2046} 2150}
2047 2151
2048sub size_request { 2152sub size_request {
2049 my ($self) = @_; 2153 my ($self) = @_;
2050 2154
… …
2056 2160
2057sub button_down { 2161sub button_down {
2058 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
2059 2163
2060 $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
2061 $self->mouse_motion ($ev, $x, $y); 2168 $self->mouse_motion ($ev, $x, $y);
2062} 2169}
2063 2170
2064sub mouse_motion { 2171sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2172 my ($self, $ev, $x, $y) = @_;
2066 2173
2067 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
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2191 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100;
2069 2193
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2194 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2071 2195
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2196 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2073 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2197 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2074 2198
2075 $x -= $inner_pad_px; # substract the padding 2199 $value = ($value - $lo) / $range;
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2200 $value = $value * $self->{scale} + $self->{offset};
2077 $x = $lo if $x < $lo;
2078 $x = $hi - $page if $x > $hi - $page;
2079 $self->{range}[0] = $x;
2080 2201
2081 $self->emit (changed => $x); 2202 $self->{knob_x} = $value - $knob_w * 0.5;
2082 $self->update; 2203 $self->{knob_w} = $knob_w;
2083 } 2204 });
2084}
2085 2205
2086# the inner_* stuff is for generating a padding for the slider handle, 2206 $self->SUPER::update;
2087# so that the handle doesn't leave the texture. This calculation isn't 100%
2088# correct propably, but it does the job for now
2089sub _calc_inner_pad_px {
2090 my ($self, $w) = @_;
2091 ($w / 100) * $self->{inner_pad} # % to pixels
2092} 2207}
2093 2208
2094sub _draw { 2209sub _draw {
2095 my ($self) = @_; 2210 my ($self) = @_;
2096 2211
2097 $self->SUPER::_draw (); 2212 $self->SUPER::_draw ();
2098 2213
2099 my ($w, $h) = @$self{qw(w h)}; 2214 glScale $self->{w}, $self->{h};
2100 2215
2101 if ($self->{vertical}) { 2216 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2217 # draw a vertical slider like a rotated horizontal slider
2103 2218
2219 glTranslate 1, 0, 0;
2104 glRotate 90, 0, 0, 1; 2220 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2221 }
2109 2222
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2223 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2224 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2225
2113 my ($value, $lo, $hi, $page) = @{$self->{range}};
2114
2115 $hi = $value + 1 if $lo == $hi;
2116
2117 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2118 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2119
2120 $page = int $page * $inner_w / ($hi - $lo);
2121 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2122
2123 $w -= $page;
2124 $page &= ~1;
2125 glTranslate $page * 0.5, 0, 0;
2126 $page ||= 2;
2127
2128 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130
2131 glEnable GL_BLEND;
2132 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133 glEnable GL_TEXTURE_2D; 2226 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2227 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2228
2136 # draw background 2229 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2230 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2231
2139 # draw handle 2232 # draw handle
2140 $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);
2141 2234
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2235 glDisable GL_TEXTURE_2D;
2144} 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 (@_) }
2145 2278
2146############################################################################# 2279#############################################################################
2147 2280
2148package CFClient::UI::TextView; 2281package CFClient::UI::TextView;
2149 2282
… …
2158 fontsize => 1, 2291 fontsize => 1,
2159 can_events => 0, 2292 can_events => 0,
2160 #font => default_font 2293 #font => default_font
2161 @_, 2294 @_,
2162 2295
2163 layout => (new CFClient::Layout), 2296 layout => (new CFClient::Layout 1),
2164 par => [], 2297 par => [],
2165 height => 0, 2298 height => 0,
2166 children => [ 2299 children => [
2167 (new CFClient::UI::Empty expand => 1), 2300 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2301 (new CFClient::UI::Slider vertical => 1),
… …
2179 2312
2180 $self->{fontsize} = $fontsize; 2313 $self->{fontsize} = $fontsize;
2181 $self->reflow; 2314 $self->reflow;
2182} 2315}
2183 2316
2184sub text_height {
2185 my ($self, $text) = @_;
2186
2187 my $layout = $self->{layout};
2188
2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190 $layout->set_width ($self->{children}[0]{w});
2191 $layout->set_text ($text);
2192
2193 ($layout->size)[1]
2194}
2195
2196sub reflow {
2197 my ($self) = @_;
2198
2199 $self->{need_reflow}++;
2200 $self->update;
2201}
2202
2203sub size_allocate { 2317sub size_allocate {
2204 my ($self, $w, $h) = @_; 2318 my ($self, $w, $h) = @_;
2205 2319
2206 $self->SUPER::size_allocate ($w, $h); 2320 $self->SUPER::size_allocate ($w, $h);
2207 2321
… …
2210 $self->{layout}->set_width ($self->{children}[0]{w}); 2324 $self->{layout}->set_width ($self->{children}[0]{w});
2211 2325
2212 $self->reflow; 2326 $self->reflow;
2213} 2327}
2214 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
2215sub add_paragraph { 2363sub add_paragraph {
2216 my ($self, $color, $text) = @_; 2364 my ($self, $color, $text, $indent) = @_;
2217 2365
2218 #TODO: intelligently "reformat" paragraph 2366 for my $line (split /\n/, $text) {
2219 2367 my ($w, $h) = $self->text_size ($line);
2220 my $height = $self->text_height ($text);
2221
2222 $self->{height} += $height; 2368 $self->{height} += $h;
2369 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2370 }
2223 2371
2224 push @{$self->{par}}, [$height, $color, $text];
2225
2226 $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]);
2227 $self->{children}[1]->update;
2228} 2373}
2229 2374
2230sub update { 2375sub update {
2231 my ($self) = @_; 2376 my ($self) = @_;
2232 2377
… …
2234 2379
2235 return unless $self->{h} > 0; 2380 return unless $self->{h} > 0;
2236 2381
2237 delete $self->{texture}; 2382 delete $self->{texture};
2238 2383
2239 $ROOT->on_refresh ($self, sub { 2384 $ROOT->on_post_alloc ($self, sub {
2385 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2386
2240 if (delete $self->{need_reflow}) { 2387 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2388 my $height = 0;
2242 2389
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2390 my $layout = $self->{layout};
2391
2392 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2393
2244 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 }
2245 2405
2246 $self->{height} = $height; 2406 $self->{height} = $height;
2247 2407
2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2408 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2249 2409
2250 delete $self->{texture}; 2410 delete $self->{texture};
2251 } 2411 }
2252 2412
2253 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2413 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2254 glClearColor 0, 0, 0, 0; 2414 glClearColor 0.5, 0.5, 0.5, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2415 glClear GL_COLOR_BUFFER_BIT;
2256 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
2257 glEnable GL_BLEND; 2428 glEnable GL_BLEND;
2429 #TODO# not correct in windows where rgba is forced off
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2430 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0];
2263
2264 my $y0 = $top;
2265 my $y1 = $top + $self->{h};
2266
2267 my $y = 0;
2268
2269 my $layout = $self->{layout};
2270
2271 $layout->set_font ($self->{font}) if $self->{font};
2272 2431
2273 for my $par (@{$self->{par}}) { 2432 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2433 my $h = $par->[1];
2275 2434
2276 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]);
2277 $layout->set_text ($par->[2]); 2438 $layout->set_markup ($par->[4]);
2278 2439
2279 glColor @{ $par->[1] }; 2440 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 my ($W, $H) = $layout->size; 2441
2281 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;
2282 } 2444 }
2283 2445
2284 $y += $h; 2446 $y += $h;
2285 } 2447 }
2286 2448
2287 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND; 2449 glDisable GL_BLEND;
2289 }; 2450 };
2290 }); 2451 });
2291} 2452}
2292 2453
2293sub _draw { 2454sub _draw {
2294 my ($self) = @_; 2455 my ($self) = @_;
2295 2456
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2457 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2459 glColor 1, 1, 1, 1;
2301 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2460 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2302 glDisable GL_TEXTURE_2D; 2461 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2462
2305 $self->{children}[1]->draw; 2463 $self->{children}[1]->draw;
2306 2464
2307} 2465}
2308 2466
… …
2376 2534
2377 # TODO: use animation 2535 # TODO: use animation
2378 if ($self->{state} = !$self->{state}) { 2536 if ($self->{state} = !$self->{state}) {
2379 $CFClient::UI::ROOT->add ($self->{other}); 2537 $CFClient::UI::ROOT->add ($self->{other});
2380 $self->{other}->move ($self->coord2global (0, $self->{h})); 2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2381 $self->emit ("open"); 2539 $self->_emit ("open");
2382 } else { 2540 } else {
2383 $CFClient::UI::ROOT->remove ($self->{other}); 2541 $CFClient::UI::ROOT->remove ($self->{other});
2384 $self->emit ("close"); 2542 $self->_emit ("close");
2385 } 2543 }
2386 2544
2387 $self->emit (changed => $self->{state}); 2545 $self->_emit (changed => $self->{state});
2388} 2546}
2389 2547
2390############################################################################# 2548#############################################################################
2391 2549
2392package CFClient::UI::Tooltip; 2550package CFClient::UI::Tooltip;
… …
2402 @_, 2560 @_,
2403 can_events => 0, 2561 can_events => 0,
2404 ) 2562 )
2405} 2563}
2406 2564
2407sub set_markup { 2565sub set_tooltip_from {
2408 my ($self, $text) = @_; 2566 my ($self, $widget) = @_;
2409 2567
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2568 $self->add (new CFClient::UI::Label
2411 $self->{label}->set_markup ($text); 2569 markup => $widget->{tooltip},
2412 $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 );
2413} 2576}
2414 2577
2415sub size_request { 2578sub size_request {
2416 my ($self) = @_; 2579 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2580
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2581 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2582
2422 ($w + 4, $h + 4) 2583 ($w + 4, $h + 4)
2423} 2584}
… …
2429} 2590}
2430 2591
2431sub _draw { 2592sub _draw {
2432 my ($self) = @_; 2593 my ($self) = @_;
2433 2594
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2595 glTranslate 0.375, 0.375;
2436 2596
2437 my ($w, $h) = @$self{qw(w h)}; 2597 my ($w, $h) = @$self{qw(w h)};
2438 2598
2439 glColor 1, 0.8, 0.4; 2599 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2610 glVertex 0 , $h;
2451 glVertex $w, $h; 2611 glVertex $w, $h;
2452 glVertex $w, 0; 2612 glVertex $w, 0;
2453 glEnd; 2613 glEnd;
2454 2614
2455 glPopMatrix; 2615 glTranslate 2 - 0.375, 2 - 0.375;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2616 $self->SUPER::_draw;
2459} 2617}
2460 2618
2461############################################################################# 2619#############################################################################
2462 2620
… …
2467use CFClient::OpenGL; 2625use CFClient::OpenGL;
2468 2626
2469sub new { 2627sub new {
2470 my $class = shift; 2628 my $class = shift;
2471 2629
2472 $class->SUPER::new ( 2630 my $self = $class->SUPER::new (
2473 aspect => 1, 2631 aspect => 1,
2474 @_, 2632 @_,
2475 ) 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
2476} 2650}
2477 2651
2478sub size_request { 2652sub size_request {
2479 (32, 8) 2653 (32, 8)
2480} 2654}
2481 2655
2656sub update {
2657 my ($self) = @_;
2658
2659 return unless $self->{visible};
2660
2661 $self->SUPER::update;
2662}
2663
2482sub _draw { 2664sub _draw {
2483 my ($self) = @_; 2665 my ($self) = @_;
2484 2666
2485 return unless $::CONN;#d# manage and cache textures differently 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
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2678 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487 2679
2488 # TODO animation
2489 if ($tex) { 2680 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2681 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2683 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2684 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2685 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2686 }
2687}
2688
2689sub DESTROY {
2690 my ($self) = @_;
2691
2692 $self->{timer}->cancel
2693 if $self->{timer};
2694
2695 $self->SUPER::DESTROY;
2499} 2696}
2500 2697
2501############################################################################# 2698#############################################################################
2502 2699
2503package CFClient::UI::InventoryItem; 2700package CFClient::UI::InventoryItem;
2504 2701
2505our @ISA = CFClient::UI::HBox::; 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}
2506 2729
2507sub new { 2730sub new {
2508 my $class = shift; 2731 my $class = shift;
2509 2732
2510 my %args = @_; 2733 my %args = @_;
2511 2734
2512 my $item = $args{item}; 2735 my $item = delete $args{item};
2513 2736
2514 my $desc = $item->{nrof} < 2 2737 my $desc = _item_to_desc ($item);
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518 2738
2519 my $self = $class->SUPER::new ( 2739 my $self = $class->SUPER::new (
2520 can_hover => 1, 2740 can_hover => 1,
2521 can_events => 1, 2741 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc) 2742 tooltip => ((CFClient::UI::Label::escape $desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub { 2744 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_; 2745 my ($self, $ev, $x, $y) = @_;
2526 2746
2527 # todo: maybe put examine on 1? but should just be a tooltip :( 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");
2528 if ($ev->{button} == 1) { 2756 } elsif ($ev->{button} == 1) {
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2757 $::CONN->send ("examine $item->{tag}");
2530 } elsif ($ev->{button} == 2) { 2758 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}"); 2759 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) { 2760 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new ( 2761 my @menu_items = (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2541 ["apply", sub { $::CONN->send ("apply $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}) }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773 )
2543 ], 2774 ),
2544 )->popup ($ev); 2775 );
2776
2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2545 } 2778 }
2546 2779
2547 1 2780 1
2548 }, 2781 },
2549 %args 2782 %args
2550 ); 2783 );
2784
2785
2551 $self->add(new CFClient::UI::Face 2786 $self->add (new CFClient::UI::Face
2552 can_events => 0, 2787 can_events => 0,
2553 face => $item->{face}, 2788 face => $item->{face},
2554 anim => $item->{anim}, 2789 anim => $item->{anim},
2555 animspeed => $item->{animspeed}); 2790 animspeed => $item->{animspeed},
2556 $self->add(new CFClient::UI::Label 2791 );
2557 can_events => 0, 2792
2558 text => $desc); 2793 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795 $self->{item} = $item;
2796
2797 $self->update_item;
2559 2798
2560 $self 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);
2561} 2808}
2562 2809
2563############################################################################# 2810#############################################################################
2564 2811
2565package CFClient::UI::Inventory; 2812package CFClient::UI::Inventory;
… …
2568 2815
2569sub new { 2816sub new {
2570 my $class = shift; 2817 my $class = shift;
2571 2818
2572 my $self = $class->SUPER::new ( 2819 my $self = $class->SUPER::new (
2573 scrolled => (new CFClient::UI::VBox), 2820 scrolled => (new CFClient::UI::Table),
2574 @_, 2821 @_,
2575 ); 2822 );
2576 2823
2577 $self 2824 $self
2578} 2825}
… …
2581 my ($self, $items) = @_; 2828 my ($self, $items) = @_;
2582 2829
2583 $self->{scrolled}->clear; 2830 $self->{scrolled}->clear;
2584 return unless $items; 2831 return unless $items;
2585 2832
2586 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2833 my @items = sort {
2834 ($a->{type} <=> $b->{type})
2835 or ($a->{name} cmp $b->{name})
2836 } @$items;
2587 2837
2588 $self->{real_items} = \@items; 2838 $self->{real_items} = \@items;
2589 2839
2590 for my $item (@items) { 2840 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2 2841 $item->{item} = $item;
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem 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);
2596 } 2851 }
2597 2852
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599} 2854}
2600 2855
… …
2643 2898
2644# popup given the event (must be a mouse button down event currently) 2899# popup given the event (must be a mouse button down event currently)
2645sub popup { 2900sub popup {
2646 my ($self, $ev) = @_; 2901 my ($self, $ev) = @_;
2647 2902
2648 $self->emit ("popdown"); 2903 $self->_emit ("popdown");
2649 2904
2650 # maybe save $GRAB? must be careful about events... 2905 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self; 2906 $GRAB = $self;
2652 $self->{button} = $ev->{button}; 2907 $self->{button} = $ev->{button};
2653 2908
… …
2668 2923
2669 if ($ev->{button} == $self->{button}) { 2924 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB; 2925 undef $GRAB;
2671 $self->hide; 2926 $self->hide;
2672 2927
2673 $self->emit ("popdown"); 2928 $self->_emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover}; 2929 $self->{hover}[1]->() if $self->{hover};
2675 } 2930 }
2676} 2931}
2677 2932
2678############################################################################# 2933#############################################################################
2679 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
2680package CFClient::UI::Root; 3043package CFClient::UI::Root;
2681 3044
2682our @ISA = CFClient::UI::Container::; 3045our @ISA = CFClient::UI::Container::;
2683 3046
2684use CFClient::OpenGL; 3047use CFClient::OpenGL;
2685 3048
3049sub new {
3050 my $class = shift;
3051
3052 $class->SUPER::new (
3053 @_,
3054 )
3055}
3056
3057sub configure {
3058 my ($self, $x, $y, $w, $h) = @_;
3059
3060 $self->{w} = $w;
3061 $self->{h} = $h;
3062}
3063
2686sub check_size { 3064sub check_size {
2687 my ($self) = @_; 3065 my ($self) = @_;
2688 3066
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 3067 $self->size_allocate ($self->{w}, $self->{h})
3068 if $self->{w};
2690} 3069}
2691 3070
2692sub size_request { 3071sub size_request {
2693 my ($self) = @_; 3072 my ($self) = @_;
2694 3073
… …
2696} 3075}
2697 3076
2698sub size_allocate { 3077sub size_allocate {
2699 my ($self, $w, $h) = @_; 3078 my ($self, $w, $h) = @_;
2700 3079
2701 my $old_w = $self->{old_w};
2702 my $old_h = $self->{old_h};
2703
2704 if ($old_w && $old_h) {
2705 for my $child ($self->children) {
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{req_w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 }
2715 }
2716
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2719}
2720
2721sub configure {
2722 my ($self, $x, $y, $w, $h) = @_;
2723
2724 $self->SUPER::configure ($x, $y, $w, $h);
2725
2726 for my $child ($self->children) { 3080 for my $child ($self->children) {
2727 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)};
2728 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
2729 $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;
2730 $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
2731 $child->configure ($X, $Y, $W, $H); 3092 $child->configure ($X, $Y, $W, $H);
2732 } 3093 }
2733} 3094}
2734 3095
2735sub _topleft { 3096sub coord2local {
2736 my ($self, $x, $y) = @_; 3097 my ($self, $x, $y) = @_;
2737 3098
2738 ($x, $y) 3099 ($x, $y)
2739} 3100}
2740 3101
3102sub coord2global {
3103 my ($self, $x, $y) = @_;
3104
3105 ($x, $y)
3106}
3107
2741sub update { 3108sub update {
2742 my ($self) = @_; 3109 my ($self) = @_;
2743 3110
2744 $self->check_size; 3111 $self->check_size;
2745 ::refresh (); 3112 $::WANT_REFRESH++;
2746} 3113}
2747 3114
2748sub add { 3115sub add {
2749 my ($self, $child) = @_; 3116 my ($self, @children) = @_;
2750 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
2751 # integerize window positions 3127 # integerise window positions
2752 $child->{x} = int $child->{x}; 3128 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y}; 3129 $child->{y} = int $child->{y};
3130 }
2754 3131
2755 $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 }
2756} 3145}
2757 3146
2758sub on_refresh { 3147sub on_refresh {
2759 my ($self, $id, $cb) = @_; 3148 my ($self, $id, $cb) = @_;
2760 3149
2761 $self->{refresh_hook}{$id} = $cb; 3150 $self->{refresh_hook}{$id} = $cb;
2762} 3151}
2763 3152
3153sub on_post_alloc {
3154 my ($self, $id, $cb) = @_;
3155
3156 $self->{post_alloc_hook}{$id} = $cb;
3157}
3158
2764sub draw { 3159sub draw {
2765 my ($self) = @_; 3160 my ($self) = @_;
2766 3161
2767 while (my $rcb = delete $self->{refresh_hook}) { 3162 while ($self->{refresh_hook}) {
2768 $_->() 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}};
2769 } 3214 }
2770 3215
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3216 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3218 glClear GL_COLOR_BUFFER_BIT;
2774 3219
2775 glMatrixMode GL_PROJECTION; 3220 glMatrixMode GL_PROJECTION;
2776 glLoadIdentity; 3221 glLoadIdentity;
2777 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778 glMatrixMode GL_MODELVIEW; 3223 glMatrixMode GL_MODELVIEW;
2779 glLoadIdentity; 3224 glLoadIdentity;
2780 3225
2781 $self->_draw; 3226 $self->_draw;
2782} 3227}
… …
2784############################################################################# 3229#############################################################################
2785 3230
2786package CFClient::UI; 3231package CFClient::UI;
2787 3232
2788$ROOT = new CFClient::UI::Root; 3233$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip; 3234$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790 3235
27911 32361
2792 3237

Diff Legend

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