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.190 by root, Mon May 8 22:17:38 2006 UTC vs.
Revision 1.232 by root, Thu May 25 02:23:14 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 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
244sub hide {
245 my ($self) = @_;
246
247 $self->set_invisible;
186 248
187 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
188 if $self->{parent}; 250 if $self->{parent};
189} 251}
190 252
… …
232 $self->{y} = $y; 294 $self->{y} = $y;
233 $self->update; 295 $self->update;
234 } 296 }
235 297
236 if ($self->{w} != $w || $self->{h} != $h) { 298 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 299 $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 } 300 }
244} 301}
245 302
246sub size_allocate { 303sub size_allocate {
247 # nothing to be done 304 # nothing to be done
248} 305}
249 306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
250sub children { 314sub 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} 315}
264 316
265sub set_max_size { 317sub set_max_size {
266 my ($self, $w, $h) = @_; 318 my ($self, $w, $h) = @_;
267 319
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 322}
271 323
272# return top left coordinates 324sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 325 my ($self, $tooltip) = @_;
275 326
276 $self->{parent} 327 $self->{tooltip} = $tooltip;
277 or Carp::confess "no parent widget in _topleft\n";#d#
278 328
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 329 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner};
331 CFClient::UI::check_tooltip;
332 }
280} 333}
281 334
282# translate global coordinates to local coordinate system 335# translate global coordinates to local coordinate system
283sub coord2local { 336sub coord2local {
284 my ($self, $x, $y) = @_; 337 my ($self, $x, $y) = @_;
285 338
286 my ($X, $Y) = $self->_topleft; 339 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 340}
289 341
290# translate local coordinates to global coordinate system 342# translate local coordinates to global coordinate system
291sub coord2global { 343sub coord2global {
292 my ($self, $x, $y) = @_; 344 my ($self, $x, $y) = @_;
293 345
294 my ($X, $Y) = $self->_topleft; 346 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 347}
297 348
298sub focus_in { 349sub focus_in {
299 my ($self) = @_; 350 my ($self) = @_;
300 351
301 return if $FOCUS == $self; 352 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 353 return unless $self->{can_focus};
303 354
304 my $focus = $FOCUS; $FOCUS = $self; 355 my $focus = $FOCUS; $FOCUS = $self;
305 356
306 $self->emit (focus_in => $focus); 357 $self->_emit (focus_in => $focus);
307 358
308 $focus->update if $focus; 359 $focus->update if $focus;
309 $FOCUS->update; 360 $FOCUS->update;
310} 361}
311 362
… …
314 365
315 return unless $FOCUS == $self; 366 return unless $FOCUS == $self;
316 367
317 my $focus = $FOCUS; undef $FOCUS; 368 my $focus = $FOCUS; undef $FOCUS;
318 369
319 $self->emit (focus_out => $focus); 370 $self->_emit (focus_out => $focus);
320 371
321 $focus->update if $focus; #? 372 $focus->update if $focus; #?
373
374 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
375 unless $FOCUS;
322} 376}
323 377
324sub mouse_motion { } 378sub mouse_motion { }
325sub button_up { } 379sub button_up { }
326sub key_down { } 380sub key_down { }
327sub key_up { } 381sub key_up { }
328 382
329sub button_down { 383sub button_down {
330 my ($self, $ev, $x, $y) = @_; 384 my ($self, $ev, $x, $y) = @_;
331 385
332 $self->focus_in; 386 $self->focus_in;
… …
372 glVertex $self->{w}, 0; 426 glVertex $self->{w}, 0;
373 glVertex $self->{w}, $self->{h}; 427 glVertex $self->{w}, $self->{h};
374 glVertex 0 , $self->{h}; 428 glVertex 0 , $self->{h};
375 glEnd; 429 glEnd;
376 glPopMatrix; 430 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 432 }
379} 433}
380 434
381sub _draw { 435sub _draw {
382 my ($self) = @_; 436 my ($self) = @_;
… …
398 452
399sub set_parent { 453sub set_parent {
400 my ($self, $parent) = @_; 454 my ($self, $parent) = @_;
401 455
402 Scalar::Util::weaken ($self->{parent} = $parent); 456 Scalar::Util::weaken ($self->{parent} = $parent);
457
458 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size
460 unless exists $self->{req_w};
461
462 $self->show;
403} 463}
404 464
405sub check_size { 465sub check_size {
406 my ($self) = @_; 466 my ($self, $forced) = @_;
407 467
408 $self->_check_size; 468 $self->{force_alloc} = 1 if $forced;
409 return;
410 #TODO: but needs a vastly more difficult algorithm
411 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
412
413 $check_size->{$self} = $self;
414
415 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
416 while (%$check_size) {
417 my @widgets = values %$check_size;
418 $_->_check_size
419 for @widgets;
420 }
421 });
422}
423
424sub _check_size {
425 my ($self) = @_;
426
427 delete $CFClient::UI::ROOT->{_check_size}{$self}; 469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428
429 $self->{parent}
430 or return 1;
431
432 my ($w, $h) = $self->{user_w} && $self->{user_h}
433 ? @$self{qw(user_w user_h)}
434 : $self->size_request;
435
436 if ($w != $self->{req_w} || $h != $self->{req_h}) {
437 $self->{req_w} = $w;
438 $self->{req_h} = $h;
439
440 $self->{parent}->_check_size
441 or $self->size_allocate (
442 (List::Util::max $self->{w}, $w),
443 (List::Util::max $self->{h}, $h),
444 );
445
446 1
447 } else {
448 0
449 }
450} 470}
451 471
452sub update { 472sub update {
453 my ($self) = @_; 473 my ($self) = @_;
454 474
455 my $update = $CFClient::UI::ROOT->{_update} ||= {}; 475 $self->{parent}->update
456 476 if $self->{parent};
457 $update->{$self} = $self;
458
459 $CFClient::UI::ROOT->on_refresh (_update => sub {
460 while (%$update) {
461 my @widgets = values %$update;
462 %$update = ();
463
464 $_->{parent} && $_->{parent}->update
465 for @widgets;
466 }
467 });
468} 477}
469 478
470sub connect { 479sub connect {
471 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
472 481
473 push @{ $self->{signal_cb}{$signal} }, $cb; 482 push @{ $self->{signal_cb}{$signal} }, $cb;
474} 483}
475 484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
476sub emit { 491sub emit {
477 my ($self, $signal, @args) = @_; 492 my ($self, $signal, @args) = @_;
478 493
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
480} 496}
481 497
482sub DESTROY { 498sub DESTROY {
483 my ($self) = @_; 499 my ($self) = @_;
484 500
501 delete $WIDGET{$self+0};
485 #$self->deactivate; 502 #$self->deactivate;
486} 503}
487 504
488############################################################################# 505#############################################################################
489 506
… …
498 my $class = shift; 515 my $class = shift;
499 516
500 # range [value, low, high, page] 517 # range [value, low, high, page]
501 518
502 $class->SUPER::new ( 519 $class->SUPER::new (
503 bg => [0, 0, 0, 0.2], 520 #bg => [0, 0, 0, 0.2],
504 active_bg => [1, 1, 1, 0.5], 521 #active_bg => [1, 1, 1, 0.5],
505 @_ 522 @_
506 ) 523 )
507} 524}
508 525
509sub _draw { 526sub _draw {
510 my ($self) = @_; 527 my ($self) = @_;
511 528
529 my $color = $FOCUS == $self && $self->{active_bg}
530 ? $self->{active_bg}
531 : $self->{bg};
532
533 if ($color && (@$color < 4 || $color->[3])) {
512 my ($w, $h) = @$self{qw(w h)}; 534 my ($w, $h) = @$self{qw(w h)};
513 535
514 glEnable GL_BLEND; 536 glEnable GL_BLEND;
515 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
516 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 538 glColor @$color;
517 539
518 glBegin GL_QUADS; 540 glBegin GL_QUADS;
519 glVertex 0 , 0; 541 glVertex 0 , 0;
520 glVertex 0 , $h; 542 glVertex 0 , $h;
521 glVertex $w, $h; 543 glVertex $w, $h;
522 glVertex $w, 0; 544 glVertex $w, 0;
523 glEnd; 545 glEnd;
524 546
525 glDisable GL_BLEND; 547 glDisable GL_BLEND;
548 }
526} 549}
527 550
528############################################################################# 551#############################################################################
529 552
530package CFClient::UI::Empty; 553package CFClient::UI::Empty;
… …
574 $self->{children} = [ 597 $self->{children} = [
575 sort { $a->{z} <=> $b->{z} } 598 sort { $a->{z} <=> $b->{z} }
576 @{$self->{children}}, @widgets 599 @{$self->{children}}, @widgets
577 ]; 600 ];
578 601
579 $_->check_size 602 $self->check_size (1);
580 for @widgets;
581
582 $self->update; 603 $self->update;
583} 604}
584 605
585sub children { 606sub children {
586 @{ $_[0]{children} } 607 @{ $_[0]{children} }
… …
693} 714}
694 715
695sub update { 716sub update {
696 my ($self) = @_; 717 my ($self) = @_;
697 718
698 $ROOT->on_refresh ($self => sub { $self->render_child }); 719 $ROOT->on_post_alloc ($self => sub { $self->render_child });
699 $self->SUPER::update; 720 $self->SUPER::update;
700} 721}
701 722
702sub size_allocate { 723sub size_allocate {
703 my ($self, $w, $h) = @_; 724 my ($self, $w, $h) = @_;
… …
716 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 737 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
717 glClearColor 0, 0, 0, 0; 738 glClearColor 0, 0, 0, 0;
718 glClear GL_COLOR_BUFFER_BIT; 739 glClear GL_COLOR_BUFFER_BIT;
719 740
720 $self->_render; 741 $self->_render;
721# glColorMask 1, 1, 1, 0;
722# glEnable GL_BLEND;
723# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
724# glRasterPos 0, 0;
725# glCopyPixels 0, 0, $self->{w}, $self->{h};
726# glDisable GL_BLEND;
727# glColorMask 1, 1, 1, 1;
728 }; 742 };
729} 743}
730 744
731sub _draw { 745sub _draw {
732 my ($self) = @_; 746 my ($self) = @_;
… …
734 my ($w, $h) = ($self->w, $self->h); 748 my ($w, $h) = ($self->w, $self->h);
735 749
736 my $tex = $self->{texture} 750 my $tex = $self->{texture}
737 or return; 751 or return;
738 752
739 glEnable GL_BLEND;
740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 753 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743 glColor 0, 0, 0, 1; 755 glColor 1, 1, 1, 1;
744 756
745 $tex->draw_quad (0, 0, $w, $h); 757 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
746 758
747 glDisable GL_BLEND;
748 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
749} 760}
750 761
751############################################################################# 762#############################################################################
752 763
… …
756 767
757sub size_request { 768sub size_request {
758 my ($self) = @_; 769 my ($self) = @_;
759 770
760 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
761 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
762 772
763 @$self{qw(child_w child_h)} 773 @$self{qw(child_w child_h)}
764} 774}
765 775
766sub size_allocate { 776sub size_allocate {
767 my ($self, $w, $h) = @_; 777 my ($self, $w, $h) = @_;
768 778
779 my ($cw, $ch) = @$self{qw(child_w child_h)};
780# $w = $self->{w};
781 $self->child->configure (0, 0, $cw, $ch);
769 $self->update; 782 $self->update;
770} 783}
771 784
772sub set_offset { 785sub set_offset {
773 my ($self, $x, $y) = @_; 786 my ($self, $x, $y) = @_;
… …
776 $self->{view_y} = int $y; 789 $self->{view_y} = int $y;
777 790
778 $self->update; 791 $self->update;
779} 792}
780 793
781# hmm, this does not work for topleft of $self... but we should not aks for that 794# hmm, this does not work for topleft of $self... but we should not ask for that
782sub _topleft { 795sub coord2local {
783 my ($self, $x, $y) = @_; 796 my ($self, $x, $y) = @_;
784 797
785 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 798 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
799}
800
801sub coord2global {
802 my ($self, $x, $y) = @_;
803
804 $x = List::Util::min $self->{w}, $x - $self->{view_x};
805 $y = List::Util::min $self->{h}, $y - $self->{view_y};
806
807 $self->SUPER::coord2global ($x, $y)
786} 808}
787 809
788sub find_widget { 810sub find_widget {
789 my ($self, $x, $y) = @_; 811 my ($self, $x, $y) = @_;
790 812
… …
818 840
819 my $slider = new CFClient::UI::Slider 841 my $slider = new CFClient::UI::Slider
820 vertical => 1, 842 vertical => 1,
821 range => [0, 0, 1, 0.01], # HACK fix 843 range => [0, 0, 1, 0.01], # HACK fix
822 connect_changed => sub { 844 connect_changed => sub {
823 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 845 $self->{vp}->set_offset (0, $_[1]);
824 }, 846 },
825 ; 847 ;
826 848
827 $self = $class->SUPER::new ( 849 $self = $class->SUPER::new (
828 vp => (new CFClient::UI::ViewPort), 850 vp => (new CFClient::UI::ViewPort expand => 1),
829 slider => $slider, 851 slider => $slider,
830 @_, 852 @_,
831 ); 853 );
832 854
833 $self->{vp}->add ($self->{scrolled}); 855 $self->{vp}->add ($self->{scrolled});
… …
835 $self->add ($self->{slider}); 857 $self->add ($self->{slider});
836 858
837 $self 859 $self
838} 860}
839 861
862sub size_allocate {
863 my ($self, $w, $h) = @_;
864
865 $self->SUPER::size_allocate ($w, $h);
866
867 my $child = $self->{vp}->child;
868 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
869}
870
840#TODO# update range on size_allocate depeneing on child 871#TODO# update range on size_allocate depending on child
841# update viewport offset on scroll 872# update viewport offset on scroll
842 873
843############################################################################# 874#############################################################################
844 875
845package CFClient::UI::Frame; 876package CFClient::UI::Frame;
… …
849use CFClient::OpenGL; 880use CFClient::OpenGL;
850 881
851sub new { 882sub new {
852 my $class = shift; 883 my $class = shift;
853 884
854 my $self = $class->SUPER::new ( 885 $class->SUPER::new (
855 bg => [1, 1, 1, 1], 886 bg => undef,
856 border_bg => [1, 1, 1, 1],
857 border => 0.8,
858 @_ 887 @_,
859 ); 888 )
860
861 $self
862} 889}
863 890
864sub _draw { 891sub _draw {
865 my ($self) = @_; 892 my ($self) = @_;
866 893
867 my ($w, $h) = ($self->{w}, $self->{h}); 894 if ($self->{bg}) {
895 my ($w, $h) = @$self{qw(w h)};
868 896
869 glEnable GL_BLEND; 897 glEnable GL_BLEND;
870 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 898 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
871 glEnable GL_TEXTURE_2D; 899 glColor @{ $self->{bg} };
872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
873 900
874# glBegin GL_QUADS; 901 glBegin GL_QUADS;
875# glColor 0, 0, 0, 0;
876# glVertex 0 , 0; 902 glVertex 0 , 0;
877# glVertex 0 , $h; 903 glVertex 0 , $h;
878# glVertex $w, $h; 904 glVertex $w, $h;
879# glVertex $w, 0; 905 glVertex $w, 0;
880# glEnd; 906 glEnd;
881 907
882
883 $self->child->draw;
884 glDisable GL_BLEND; 908 glDisable GL_BLEND;
885 glDisable GL_TEXTURE_2D; 909 }
910
911 $self->SUPER::_draw;
886} 912}
887 913
888############################################################################# 914#############################################################################
889 915
890package CFClient::UI::FancyFrame; 916package CFClient::UI::FancyFrame;
… …
901 my $class = shift; 927 my $class = shift;
902 928
903 # TODO: user_x, user_y, overwrite moveto? 929 # TODO: user_x, user_y, overwrite moveto?
904 930
905 my $self = $class->SUPER::new ( 931 my $self = $class->SUPER::new (
906 bg => [1, 1, 1, 1], 932 bg => [1, 1, 1, 1],
907 border_bg => [1, 1, 1, 1], 933 border_bg => [1, 1, 1, 1],
908 border => 0.6, 934 border => 0.6,
935 is_toplevel => 1,
909 can_events => 1, 936 can_events => 1,
910 @_ 937 @_
911 ); 938 );
912 939
913 $self->{title} &&= new CFClient::UI::Label 940 $self->{title} &&= new CFClient::UI::Label
914 align => 0, 941 align => 0,
… …
938 my ($self, $w, $h) = @_; 965 my ($self, $w, $h) = @_;
939 966
940 $h -= List::Util::max 0, $self->border * 2; 967 $h -= List::Util::max 0, $self->border * 2;
941 $w -= List::Util::max 0, $self->border * 2; 968 $w -= List::Util::max 0, $self->border * 2;
942 969
943 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 970 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
944 if $self->{title}; 971 if $self->{title};
945 972
946 $self->child->configure ($self->border, $self->border, $w, $h); 973 $self->child->configure ($self->border, $self->border, $w, $h);
947} 974}
948 975
… …
1006 my ($self) = @_; 1033 my ($self) = @_;
1007 1034
1008 my ($w, $h ) = ($self->{w}, $self->{h}); 1035 my ($w, $h ) = ($self->{w}, $self->{h});
1009 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1010 1037
1011 glEnable GL_BLEND;
1012 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1013 glEnable GL_TEXTURE_2D; 1038 glEnable GL_TEXTURE_2D;
1014 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1015 1040
1016 my $border = $self->border; 1041 my $border = $self->border;
1017 1042
1018 glColor @{ $self->{border_bg} }; 1043 glColor @{ $self->{border_bg} };
1019 $tex[1]->draw_quad (0, 0, $w, $border); 1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
1020 $tex[3]->draw_quad (0, $border, $border, $ch); 1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1022 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1023 1048
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1025 my $bg = $tex[0]; 1050 my $bg = $tex[0];
1026 1051
1027 # TODO: repeat texture not scale 1052 # TODO: repeat texture not scale
… …
1031 glColor @{ $self->{bg} }; 1056 glColor @{ $self->{bg} };
1032 1057
1033 $bg->{s} = $rep_x; 1058 $bg->{s} = $rep_x;
1034 $bg->{t} = $rep_y; 1059 $bg->{t} = $rep_y;
1035 $bg->{wrap_mode} = 1; 1060 $bg->{wrap_mode} = 1;
1036 $bg->draw_quad ($border, $border, $cw, $ch); 1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 }
1037 1063
1038 glDisable GL_TEXTURE_2D; 1064 glDisable GL_TEXTURE_2D;
1039 glDisable GL_BLEND;
1040 }
1041 1065
1042 $self->{title}->draw if $self->{title}; 1066 $self->{title}->draw if $self->{title};
1043 1067
1044 $self->child->draw; 1068 $self->child->draw;
1045} 1069}
… …
1272} 1296}
1273 1297
1274sub size_allocate { 1298sub size_allocate {
1275 my ($self, $w, $h) = @_; 1299 my ($self, $w, $h) = @_;
1276 1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1277 my $children = $self->{children}; 1303 my $children = $self->{children};
1278 1304
1279 my @h = map $_->{req_h}, @$children; 1305 my @h = map $_->{req_h}, @$children;
1280 1306
1281 my $req_h = List::Util::sum @h; 1307 my $req_h = List::Util::sum @h;
… …
1310 1336
1311############################################################################# 1337#############################################################################
1312 1338
1313package CFClient::UI::Label; 1339package CFClient::UI::Label;
1314 1340
1315our @ISA = CFClient::UI::Base::; 1341our @ISA = CFClient::UI::DrawBG::;
1316 1342
1317use CFClient::OpenGL; 1343use CFClient::OpenGL;
1318 1344
1319sub new { 1345sub new {
1320 my ($class, %arg) = @_; 1346 my ($class, %arg) = @_;
1321 1347
1322 my $self = $class->SUPER::new ( 1348 my $self = $class->SUPER::new (
1323 fg => [1, 1, 1], 1349 fg => [1, 1, 1],
1350 #bg => none
1351 #active_bg => none
1324 #font => default_font 1352 #font => default_font
1353 #text => initial text
1354 #markup => initial narkup
1355 #max_w => maximum pixel width
1356 ellipsise => 3, # end
1357 layout => (new CFClient::Layout),
1325 fontsize => 1, 1358 fontsize => 1,
1326 text => "",
1327 align => -1, 1359 align => -1,
1328 valign => -1, 1360 valign => -1,
1329 padding => 2, 1361 padding => 2,
1330 layout => new CFClient::Layout,
1331 can_events => 0, 1362 can_events => 0,
1332 %arg 1363 %arg
1333 ); 1364 );
1334 1365
1335 if (exists $self->{template}) { 1366 if (exists $self->{template}) {
1336 my $layout = new CFClient::Layout; 1367 my $layout = new CFClient::Layout;
1337 $layout->set_text (delete $self->{template}); 1368 $layout->set_text (delete $self->{template});
1338 $self->{template} = $layout; 1369 $self->{template} = $layout;
1339 } 1370 }
1340 1371
1341 $self->set_text (delete $self->{text}) if exists $self->{text}; 1372 if (exists $self->{markup}) {
1342 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1373 $self->set_markup (delete $self->{markup});
1374 } else {
1375 $self->set_text (delete $self->{text});
1376 }
1343 1377
1344 $self 1378 $self
1345} 1379}
1346 1380
1347sub escape { 1381sub escape($) {
1348 local $_ = $_[1]; 1382 local $_ = $_[0];
1349 1383
1350 s/&/&amp;/g; 1384 s/&/&amp;/g;
1351 s/>/&gt;/g; 1385 s/>/&gt;/g;
1352 s/</&lt;/g; 1386 s/</&lt;/g;
1353 1387
1354 $_[1] 1388 $_
1355} 1389}
1356 1390
1357sub update { 1391sub update {
1358 my ($self) = @_; 1392 my ($self) = @_;
1359 1393
… …
1365 my ($self, $text) = @_; 1399 my ($self, $text) = @_;
1366 1400
1367 return if $self->{text} eq "T$text"; 1401 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text"; 1402 $self->{text} = "T$text";
1369 1403
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1405 $self->{layout}->set_text ($text);
1371 1406
1372 delete $self->{texture};
1373 $self->update; 1407 $self->update;
1374 $self->check_size; 1408 $self->check_size;
1375} 1409}
1376 1410
1377sub set_markup { 1411sub set_markup {
1378 my ($self, $markup) = @_; 1412 my ($self, $markup) = @_;
1379 1413
1380 return if $self->{text} eq "M$markup"; 1414 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup"; 1415 $self->{text} = "M$markup";
1382 1416
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418
1419 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1383 $self->{layout}->set_markup ($markup); 1420 $self->{layout}->set_markup ($markup);
1384 1421
1385 delete $self->{texture};
1386 $self->update; 1422 $self->update;
1387 $self->check_size; 1423 $self->check_size;
1388} 1424}
1389 1425
1390sub size_request { 1426sub size_request {
1391 my ($self) = @_; 1427 my ($self) = @_;
1392 1428
1393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1429 $self->{layout}->set_font ($self->{font}) if $self->{font};
1394 $self->{layout}->set_width ($self->{max_w} || -1); 1430 $self->{layout}->set_width ($self->{max_w} || -1);
1431 $self->{layout}->set_ellipsise ($self->{ellipsise});
1432 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1433 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1396 1434
1397 my ($w, $h) = $self->{layout}->size; 1435 my ($w, $h) = $self->{layout}->size;
1398 1436
1399 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1429} 1467}
1430 1468
1431sub _draw { 1469sub _draw {
1432 my ($self) = @_; 1470 my ($self) = @_;
1433 1471
1472 $self->SUPER::_draw; # draw background, if applicable
1473
1434 my $tex = $self->{texture} ||= do { 1474 my $tex = $self->{texture} ||= do {
1475 $self->{layout}->set_foreground (@{$self->{fg}});
1435 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1476 $self->{layout}->set_font ($self->{font}) if $self->{font};
1436 $self->{layout}->set_width ($self->{w}); 1477 $self->{layout}->set_width ($self->{w});
1478 $self->{layout}->set_ellipsise ($self->{ellipsise});
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1437 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481
1438 new_from_layout CFClient::Texture $self->{layout} 1482 my $tex = new_from_layout CFClient::Texture $self->{layout};
1483
1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1486 : ($self->{w} - $tex->{w}) * 0.5);
1487
1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1490 : ($self->{h} - $tex->{h}) * 0.5);
1491
1492 $tex
1439 }; 1493 };
1440 1494
1441 glEnable GL_BLEND;
1442 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1443 glEnable GL_TEXTURE_2D; 1495 glEnable GL_TEXTURE_2D;
1444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1445 1497
1498 if ($tex->{format} == GL_ALPHA) {
1446 glColor @{$self->{fg}}; 1499 glColor @{$self->{fg}};
1447
1448 $self->{ox} = int (
1449 $self->{align} < 0 ? $self->{padding}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1451 : ($self->{w} - $tex->{w}) * 0.5
1452 );
1453
1454 $self->{oy} = int (
1455 $self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5
1458 );
1459
1460 $tex->draw_quad ($self->{ox}, $self->{oy}); 1500 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1501 } else {
1502 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1503 }
1461 1504
1462 glDisable GL_TEXTURE_2D; 1505 glDisable GL_TEXTURE_2D;
1463 glDisable GL_BLEND;
1464} 1506}
1465 1507
1466############################################################################# 1508#############################################################################
1467 1509
1468package CFClient::UI::EntryBase; 1510package CFClient::UI::EntryBase;
… …
1481 active_fg => [0, 0, 0], 1523 active_fg => [0, 0, 0],
1482 can_hover => 1, 1524 can_hover => 1,
1483 can_focus => 1, 1525 can_focus => 1,
1484 valign => 0, 1526 valign => 0,
1485 can_events => 1, 1527 can_events => 1,
1528 #text => ...
1486 @_ 1529 @_
1487 ) 1530 )
1488} 1531}
1489 1532
1490sub _set_text { 1533sub _set_text {
… …
1500 $self->{text} = $text; 1543 $self->{text} = $text;
1501 1544
1502 $text =~ s/./*/g if $self->{hidden}; 1545 $text =~ s/./*/g if $self->{hidden};
1503 $self->{layout}->set_text ("$text "); 1546 $self->{layout}->set_text ("$text ");
1504 1547
1505 $self->emit (changed => $self->{text}); 1548 $self->_emit (changed => $self->{text});
1506}
1507
1508sub get_text {
1509 $_[0]{text}
1510}
1511
1512sub size_request {
1513 my ($self) = @_;
1514
1515 my ($w, $h) = $self->SUPER::size_request;
1516
1517 ($w + 1, $h) # add 1 for cursor
1518}
1519
1520sub size_allocate {
1521 my ($self, $w, $h) = @_;
1522
1523 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1524} 1549}
1525 1550
1526sub set_text { 1551sub set_text {
1527 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1528 1553
1529 $self->{cursor} = length $text; 1554 $self->{cursor} = length $text;
1530 $self->_set_text ($text); 1555 $self->_set_text ($text);
1531 $self->update; 1556 $self->update;
1557 $self->check_size;
1558}
1559
1560sub get_text {
1561 $_[0]{text}
1562}
1563
1564sub size_request {
1565 my ($self) = @_;
1566
1567 my ($w, $h) = $self->SUPER::size_request;
1568
1569 ($w + 1, $h) # add 1 for cursor
1532} 1570}
1533 1571
1534sub key_down { 1572sub key_down {
1535 my ($self, $ev) = @_; 1573 my ($self, $ev) = @_;
1536 1574
… …
1538 my $sym = $ev->{sym}; 1576 my $sym = $ev->{sym};
1539 my $uni = $ev->{unicode}; 1577 my $uni = $ev->{unicode};
1540 1578
1541 my $text = $self->get_text; 1579 my $text = $self->get_text;
1542 1580
1543 if ($sym == 8) { 1581 if ($uni == 8) {
1544 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1582 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1545 } elsif ($sym == 127) { 1583 } elsif ($uni == 127) {
1546 substr $text, $self->{cursor}, 1, ""; 1584 substr $text, $self->{cursor}, 1, "";
1547 } elsif ($sym == CFClient::SDLK_LEFT) { 1585 } elsif ($sym == CFClient::SDLK_LEFT) {
1548 --$self->{cursor} if $self->{cursor}; 1586 --$self->{cursor} if $self->{cursor};
1549 } elsif ($sym == CFClient::SDLK_RIGHT) { 1587 } elsif ($sym == CFClient::SDLK_RIGHT) {
1550 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1588 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1551 } elsif ($sym == CFClient::SDLK_HOME) { 1589 } elsif ($sym == CFClient::SDLK_HOME) {
1552 $self->{cursor} = 0; 1590 $self->{cursor} = 0;
1553 } elsif ($sym == CFClient::SDLK_END) { 1591 } elsif ($sym == CFClient::SDLK_END) {
1554 $self->{cursor} = length $text; 1592 $self->{cursor} = length $text;
1555 } elsif ($sym == 27) { 1593 } elsif ($uni == 27) {
1556 $self->emit ('escape'); 1594 $self->_emit ('escape');
1557 } elsif ($uni) { 1595 } elsif ($uni) {
1558 substr $text, $self->{cursor}++, 0, chr $uni; 1596 substr $text, $self->{cursor}++, 0, chr $uni;
1559 } 1597 }
1560 1598
1561 $self->_set_text ($text); 1599 $self->_set_text ($text);
1562 $self->update; 1600 $self->update;
1601 $self->check_size;
1563} 1602}
1564 1603
1565sub focus_in { 1604sub focus_in {
1566 my ($self) = @_; 1605 my ($self) = @_;
1567 1606
… …
1647 if ($sym == 13) { 1686 if ($sym == 13) {
1648 unshift @{$self->{history}}, 1687 unshift @{$self->{history}},
1649 my $txt = $self->get_text; 1688 my $txt = $self->get_text;
1650 $self->{history_pointer} = -1; 1689 $self->{history_pointer} = -1;
1651 $self->{history_saveback} = ''; 1690 $self->{history_saveback} = '';
1652 $self->emit (activate => $txt); 1691 $self->_emit (activate => $txt);
1653 $self->update; 1692 $self->update;
1654 1693
1655 } elsif ($sym == CFClient::SDLK_UP) { 1694 } elsif ($sym == CFClient::SDLK_UP) {
1656 if ($self->{history_pointer} < 0) { 1695 if ($self->{history_pointer} < 0) {
1657 $self->{history_saveback} = $self->get_text; 1696 $self->{history_saveback} = $self->get_text;
… …
1696 my $class = shift; 1735 my $class = shift;
1697 1736
1698 $class->SUPER::new ( 1737 $class->SUPER::new (
1699 padding => 4, 1738 padding => 4,
1700 fg => [1, 1, 1], 1739 fg => [1, 1, 1],
1701 bg => [1, 1, 1, 0.2],
1702 active_fg => [0, 0, 1], 1740 active_fg => [0, 0, 1],
1703 can_hover => 1, 1741 can_hover => 1,
1704 align => 0, 1742 align => 0,
1705 valign => 0, 1743 valign => 0,
1706 can_events => 1, 1744 can_events => 1,
1707 @_ 1745 @_
1708 ) 1746 )
1709} 1747}
1710 1748
1749sub activate { }
1750
1711sub button_up { 1751sub button_up {
1712 my ($self, $ev, $x, $y) = @_; 1752 my ($self, $ev, $x, $y) = @_;
1713 1753
1754 $self->emit ("activate")
1714 if ($x >= 0 && $x < $self->{w} 1755 if $x >= 0 && $x < $self->{w}
1715 && $y >= 0 && $y < $self->{h}) { 1756 && $y >= 0 && $y < $self->{h};
1716 $self->emit ("activate");
1717 }
1718} 1757}
1719 1758
1720sub _draw { 1759sub _draw {
1721 my ($self) = @_; 1760 my ($self) = @_;
1722 1761
… …
1724 1763
1725 if ($GRAB == $self) { 1764 if ($GRAB == $self) {
1726 $self->{fg} = $self->{active_fg}; 1765 $self->{fg} = $self->{active_fg};
1727 } 1766 }
1728 1767
1729 glEnable GL_BLEND;
1730 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1731 glEnable GL_TEXTURE_2D; 1768 glEnable GL_TEXTURE_2D;
1732 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1733 glColor 0, 0, 0, 1; 1770 glColor 0, 0, 0, 1;
1734 1771
1735 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1772 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1736 1773
1737 glDisable GL_TEXTURE_2D; 1774 glDisable GL_TEXTURE_2D;
1738 glDisable GL_BLEND;
1739 1775
1740 $self->SUPER::_draw; 1776 $self->SUPER::_draw;
1741} 1777}
1742 1778
1743############################################################################# 1779#############################################################################
… …
1757 1793
1758 $class->SUPER::new ( 1794 $class->SUPER::new (
1759 padding => 2, 1795 padding => 2,
1760 fg => [1, 1, 1], 1796 fg => [1, 1, 1],
1761 active_fg => [1, 1, 0], 1797 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5],
1762 state => 0, 1800 state => 0,
1763 can_hover => 1, 1801 can_hover => 1,
1764 @_ 1802 @_
1765 ) 1803 )
1766} 1804}
… …
1775 my ($self, $ev, $x, $y) = @_; 1813 my ($self, $ev, $x, $y) = @_;
1776 1814
1777 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1778 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1779 $self->{state} = !$self->{state}; 1817 $self->{state} = !$self->{state};
1780 $self->emit (changed => $self->{state}); 1818 $self->_emit (changed => $self->{state});
1781 } 1819 }
1782} 1820}
1783 1821
1784sub _draw { 1822sub _draw {
1785 my ($self) = @_; 1823 my ($self) = @_;
… …
1790 1828
1791 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1829 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1792 1830
1793 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1794 1832
1795 glEnable GL_BLEND; 1833 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834
1796 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798
1799 my $tex = $self->{state} ? $tex[1] : $tex[0];
1800
1801 $tex->draw_quad (0, 0, $s, $s); 1836 $tex->draw_quad_alpha (0, 0, $s, $s);
1802
1803 glDisable GL_TEXTURE_2D; 1837 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805} 1838}
1806 1839
1807############################################################################# 1840#############################################################################
1808 1841
1809package CFClient::UI::Image; 1842package CFClient::UI::Image;
… …
1852 glTranslate 0, -$self->{w}, 0; 1885 glTranslate 0, -$self->{w}, 0;
1853 1886
1854 ($w, $h) = ($h, $w); 1887 ($w, $h) = ($h, $w);
1855 } 1888 }
1856 1889
1857 glEnable GL_BLEND;
1858 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1859 glEnable GL_TEXTURE_2D; 1890 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1891 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 1892
1862 $tex->draw_quad (0, 0, $w, $h); 1893 $tex->draw_quad_alpha (0, 0, $w, $h);
1863 1894
1864 glDisable GL_BLEND;
1865 glDisable GL_TEXTURE_2D; 1895 glDisable GL_TEXTURE_2D;
1866} 1896}
1867 1897
1868############################################################################# 1898#############################################################################
1869 1899
… …
2058 qw(s1_slider.png s1_slider_bg.png); 2088 qw(s1_slider.png s1_slider_bg.png);
2059 2089
2060sub new { 2090sub new {
2061 my $class = shift; 2091 my $class = shift;
2062 2092
2063 # range [value, low, high, page] 2093 # range [value, low, high, page, unit]
2064 2094
2065 # TODO: 0-width page 2095 # TODO: 0-width page
2066 # TODO: req_w/h are wrong with vertical 2096 # TODO: req_w/h are wrong with vertical
2067 # TODO: calculations are off 2097 # TODO: calculations are off
2068 my $self = $class->SUPER::new ( 2098 my $self = $class->SUPER::new (
2069 fg => [1, 1, 1], 2099 fg => [1, 1, 1],
2070 active_fg => [0, 0, 0], 2100 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5],
2071 range => [0, 0, 100, 10], 2103 range => [0, 0, 100, 10, 0],
2072 req_w => $::WIDTH / 80, 2104 req_w => $::WIDTH / 80,
2073 req_h => $::WIDTH / 80, 2105 req_h => $::WIDTH / 80,
2074 vertical => 0, 2106 vertical => 0,
2075 can_hover => 1, 2107 can_hover => 1,
2076 inner_pad => 5, 2108 inner_pad => 0.02,
2077 @_ 2109 @_
2078 ); 2110 );
2079 2111
2112 $self->set_value ($self->{range}[0]);
2113 $self->update;
2114
2080 $self 2115 $self
2116}
2117
2118sub set_range {
2119 my ($self, $range) = @_;
2120
2121 $self->{range} = $range;
2122
2123 $self->update;
2124}
2125
2126sub set_value {
2127 my ($self, $value) = @_;
2128
2129 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2130
2131 $hi = $lo + 1 if $hi <= $lo;
2132
2133 $page = $hi - $lo if $page > $hi - $lo;
2134
2135 $value = $lo if $value < $lo;
2136 $value = $hi - $page if $value > $hi - $page;
2137
2138 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2139 if $unit;
2140
2141 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2142
2143 if ($value != $old_value) {
2144 $self->_emit (changed => $value);
2145 $self->update;
2146 }
2081} 2147}
2082 2148
2083sub size_request { 2149sub size_request {
2084 my ($self) = @_; 2150 my ($self) = @_;
2085 2151
… …
2091 2157
2092sub button_down { 2158sub button_down {
2093 my ($self, $ev, $x, $y) = @_; 2159 my ($self, $ev, $x, $y) = @_;
2094 2160
2095 $self->SUPER::button_down ($ev, $x, $y); 2161 $self->SUPER::button_down ($ev, $x, $y);
2162
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164
2096 $self->mouse_motion ($ev, $x, $y); 2165 $self->mouse_motion ($ev, $x, $y);
2097} 2166}
2098 2167
2099sub mouse_motion { 2168sub mouse_motion {
2100 my ($self, $ev, $x, $y) = @_; 2169 my ($self, $ev, $x, $y) = @_;
2101 2170
2102 if ($GRAB == $self) { 2171 if ($GRAB == $self) {
2172 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2173
2174 my (undef, $lo, $hi, $page) = @{$self->{range}};
2175
2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2177
2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2179 }
2180}
2181
2182sub update {
2183 my ($self) = @_;
2184
2185 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2186 $self->set_value ($self->{range}[0]);
2187
2103 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2188 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100;
2104 2190
2105 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2191 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2106 2192
2107 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2193 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2108 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2194 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2109 2195
2110 $x -= $inner_pad_px; # substract the padding 2196 $value = ($value - $lo) / $range;
2111 $x = $x * ($hi - $lo) / $inner_w + $lo; 2197 $value = $value * $self->{scale} + $self->{offset};
2112 $x = $lo if $x < $lo;
2113 $x = $hi - $page if $x > $hi - $page;
2114 $self->{range}[0] = $x;
2115 2198
2116 $self->emit (changed => $x); 2199 $self->{knob_x} = $value - $knob_w * 0.5;
2117 $self->update; 2200 $self->{knob_w} = $knob_w;
2118 } 2201 });
2119}
2120 2202
2121# the inner_* stuff is for generating a padding for the slider handle, 2203 $self->SUPER::update;
2122# so that the handle doesn't leave the texture. This calculation isn't 100%
2123# correct propably, but it does the job for now
2124sub _calc_inner_pad_px {
2125 my ($self, $w) = @_;
2126 ($w / 100) * $self->{inner_pad} # % to pixels
2127} 2204}
2128 2205
2129sub _draw { 2206sub _draw {
2130 my ($self) = @_; 2207 my ($self) = @_;
2131 2208
2132 $self->SUPER::_draw (); 2209 $self->SUPER::_draw ();
2133 2210
2134 my ($w, $h) = @$self{qw(w h)}; 2211 glScale $self->{w}, $self->{h};
2135 2212
2136 if ($self->{vertical}) { 2213 if ($self->{vertical}) {
2137 # draw a vertical slider like a rotated horizontal slider 2214 # draw a vertical slider like a rotated horizontal slider
2138 2215
2216 glTranslate 1, 0, 0;
2139 glRotate 90, 0, 0, 1; 2217 glRotate 90, 0, 0, 1;
2140 glTranslate 0, -$self->{w}, 0;
2141
2142 ($w, $h) = ($h, $w);
2143 } 2218 }
2144 2219
2145 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2220 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2146 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2221 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2147 2222
2148 my ($value, $lo, $hi, $page) = @{$self->{range}};
2149
2150 $hi = $value + 1 if $lo == $hi;
2151
2152 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2153 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2154
2155 $page = int $page * $inner_w / ($hi - $lo);
2156 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2157
2158 $w -= $page;
2159 $page &= ~1;
2160 glTranslate $page * 0.5, 0, 0;
2161 $page ||= 2;
2162
2163 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2164 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2165
2166 glEnable GL_BLEND;
2167 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2168 glEnable GL_TEXTURE_2D; 2223 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 2225
2171 # draw background 2226 # draw background
2172 $tex[1]->draw_quad (0, 0, $w, $h); 2227 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2173 2228
2174 # draw handle 2229 # draw handle
2175 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2230 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2176 2231
2177 glDisable GL_BLEND;
2178 glDisable GL_TEXTURE_2D; 2232 glDisable GL_TEXTURE_2D;
2179} 2233}
2234
2235#############################################################################
2236
2237package CFClient::UI::ValSlider;
2238
2239our @ISA = CFClient::UI::HBox::;
2240
2241sub new {
2242 my ($class, %arg) = @_;
2243
2244 my $range = delete $arg{range};
2245
2246 my $self = $class->SUPER::new (
2247 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2248 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2249 to_value => sub { shift },
2250 from_value => sub { shift },
2251 %arg,
2252 );
2253
2254 $self->{slider}->connect (changed => sub {
2255 my ($self, $value) = @_;
2256 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2257 $self->{parent}->emit (changed => $value);
2258 });
2259
2260# $self->{entry}->connect (changed => sub {
2261# my ($self, $value) = @_;
2262# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2263# $self->{parent}->emit (changed => $value);
2264# });
2265
2266 $self->add ($self->{slider}, $self->{entry});
2267
2268 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2269
2270 $self
2271}
2272
2273sub set_range { shift->{slider}->set_range (@_) }
2274sub set_value { shift->{slider}->set_value (@_) }
2180 2275
2181############################################################################# 2276#############################################################################
2182 2277
2183package CFClient::UI::TextView; 2278package CFClient::UI::TextView;
2184 2279
… …
2193 fontsize => 1, 2288 fontsize => 1,
2194 can_events => 0, 2289 can_events => 0,
2195 #font => default_font 2290 #font => default_font
2196 @_, 2291 @_,
2197 2292
2198 layout => (new CFClient::Layout), 2293 layout => (new CFClient::Layout 1),
2199 par => [], 2294 par => [],
2200 height => 0, 2295 height => 0,
2201 children => [ 2296 children => [
2202 (new CFClient::UI::Empty expand => 1), 2297 (new CFClient::UI::Empty expand => 1),
2203 (new CFClient::UI::Slider vertical => 1), 2298 (new CFClient::UI::Slider vertical => 1),
… …
2214 2309
2215 $self->{fontsize} = $fontsize; 2310 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2311 $self->reflow;
2217} 2312}
2218 2313
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_text ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2314sub size_allocate {
2239 my ($self, $w, $h) = @_; 2315 my ($self, $w, $h) = @_;
2240 2316
2241 $self->SUPER::size_allocate ($w, $h); 2317 $self->SUPER::size_allocate ($w, $h);
2242 2318
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2321 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2322
2247 $self->reflow; 2323 $self->reflow;
2248} 2324}
2249 2325
2326sub text_size {
2327 my ($self, $text, $indent) = @_;
2328
2329 my $layout = $self->{layout};
2330
2331 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2332 $layout->set_width ($self->{children}[0]{w} - $indent);
2333 $layout->set_markup ($text);
2334
2335 $layout->size
2336}
2337
2338sub reflow {
2339 my ($self) = @_;
2340
2341 $self->{need_reflow}++;
2342 $self->update;
2343}
2344
2345sub set_offset {
2346 my ($self, $offset) = @_;
2347
2348 # todo: base offset on lines or so, not on pixels
2349 $self->{children}[1]->set_value ($offset);
2350}
2351
2352sub clear {
2353 my ($self) = @_;
2354
2355 $self->{par} = [];
2356 $self->{height} = 0;
2357 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2358}
2359
2250sub add_paragraph { 2360sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2361 my ($self, $color, $text, $indent) = @_;
2252 2362
2253 #TODO: intelligently "reformat" paragraph 2363 for my $line (split /\n/, $text) {
2254 2364 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2365 $self->{height} += $h;
2366 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2367 }
2258 2368
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2369 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262 $self->{children}[1]->update;
2263} 2370}
2264 2371
2265sub update { 2372sub update {
2266 my ($self) = @_; 2373 my ($self) = @_;
2267 2374
… …
2269 2376
2270 return unless $self->{h} > 0; 2377 return unless $self->{h} > 0;
2271 2378
2272 delete $self->{texture}; 2379 delete $self->{texture};
2273 2380
2274 $ROOT->on_refresh ($self, sub { 2381 $ROOT->on_post_alloc ($self, sub {
2382 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2383
2275 if (delete $self->{need_reflow}) { 2384 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2385 my $height = 0;
2277 2386
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2387 my $layout = $self->{layout};
2388
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390
2279 for @{$self->{par}}; 2391 for (@{$self->{par}}) {
2392 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2393 $layout->set_width ($W - $_->[3]);
2394 $layout->set_markup ($_->[4]);
2395 my ($w, $h) = $layout->size;
2396 $_->[0] = $w + $_->[3];
2397 $_->[1] = $h;
2398 }
2399
2400 $height += $_->[1];
2401 }
2280 2402
2281 $self->{height} = $height; 2403 $self->{height} = $height;
2282 2404
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2405 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2406
2285 delete $self->{texture}; 2407 delete $self->{texture};
2286 } 2408 }
2287 2409
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2410 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2411 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2412 glClear GL_COLOR_BUFFER_BIT;
2291 2413
2414 my $top = int $self->{children}[1]{range}[0];
2415
2416 my $y0 = $top;
2417 my $y1 = $top + $H;
2418
2419 my $y = 0;
2420
2421 my $layout = $self->{layout};
2422
2423 $layout->set_font ($self->{font}) if $self->{font};
2424
2292 glEnable GL_BLEND; 2425 glEnable GL_BLEND;
2426 #TODO# not correct in windows where rgba is forced off
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2427 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296
2297 my $top = int $self->{children}[1]{range}[0];
2298
2299 my $y0 = $top;
2300 my $y1 = $top + $self->{h};
2301
2302 my $y = 0;
2303
2304 my $layout = $self->{layout};
2305
2306 $layout->set_font ($self->{font}) if $self->{font};
2307 2428
2308 for my $par (@{$self->{par}}) { 2429 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2430 my $h = $par->[1];
2310 2431
2311 if ($y0 < $y + $h && $y < $y1) { 2432 if ($y0 < $y + $h && $y < $y1) {
2433 $layout->set_foreground (@{ $par->[2] });
2434 $layout->set_width ($W - $par->[3]);
2312 $layout->set_text ($par->[2]); 2435 $layout->set_markup ($par->[4]);
2313 2436
2314 glColor @{ $par->[1] }; 2437 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2315 my ($W, $H) = $layout->size; 2438
2316 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2439 glRasterPos $par->[3], $y - $y0;
2440 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2317 } 2441 }
2318 2442
2319 $y += $h; 2443 $y += $h;
2320 } 2444 }
2321 2445
2322 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND; 2446 glDisable GL_BLEND;
2324 }; 2447 };
2325 }); 2448 });
2326} 2449}
2327 2450
2328sub _draw { 2451sub _draw {
2329 my ($self) = @_; 2452 my ($self) = @_;
2330 2453
2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2333 glEnable GL_TEXTURE_2D; 2454 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2456 glColor 1, 1, 1, 1;
2336 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2457 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2458 glDisable GL_TEXTURE_2D;
2338 glDisable GL_BLEND;
2339 2459
2340 $self->{children}[1]->draw; 2460 $self->{children}[1]->draw;
2341 2461
2342} 2462}
2343 2463
… …
2411 2531
2412 # TODO: use animation 2532 # TODO: use animation
2413 if ($self->{state} = !$self->{state}) { 2533 if ($self->{state} = !$self->{state}) {
2414 $CFClient::UI::ROOT->add ($self->{other}); 2534 $CFClient::UI::ROOT->add ($self->{other});
2415 $self->{other}->move ($self->coord2global (0, $self->{h})); 2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2416 $self->emit ("open"); 2536 $self->_emit ("open");
2417 } else { 2537 } else {
2418 $CFClient::UI::ROOT->remove ($self->{other}); 2538 $CFClient::UI::ROOT->remove ($self->{other});
2419 $self->emit ("close"); 2539 $self->_emit ("close");
2420 } 2540 }
2421 2541
2422 $self->emit (changed => $self->{state}); 2542 $self->_emit (changed => $self->{state});
2423} 2543}
2424 2544
2425############################################################################# 2545#############################################################################
2426 2546
2427package CFClient::UI::Tooltip; 2547package CFClient::UI::Tooltip;
… …
2437 @_, 2557 @_,
2438 can_events => 0, 2558 can_events => 0,
2439 ) 2559 )
2440} 2560}
2441 2561
2442sub set_markup { 2562sub set_tooltip_from {
2443 my ($self, $text) = @_; 2563 my ($self, $widget) = @_;
2444 2564
2445 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2565 $self->add (new CFClient::UI::Label
2446 $self->{label}->set_markup ($text); 2566 markup => $widget->{tooltip},
2447 $self->add ($self->{label}); 2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568 fontsize => 0.8,
2569 fg => [0, 0, 0, 1],
2570 ellipsise => 0,
2571 font => ($widget->{tooltip_font} || $::FONT_PROP),
2572 );
2448} 2573}
2449 2574
2450sub size_request { 2575sub size_request {
2451 my ($self) = @_; 2576 my ($self) = @_;
2452
2453 $self->child->set_max_size ($::WIDTH * 0.3);
2454 2577
2455 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2578 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456 2579
2457 ($w + 4, $h + 4) 2580 ($w + 4, $h + 4)
2458} 2581}
… …
2464} 2587}
2465 2588
2466sub _draw { 2589sub _draw {
2467 my ($self) = @_; 2590 my ($self) = @_;
2468 2591
2469 glPushMatrix;
2470 glTranslate 0.375, 0.375; 2592 glTranslate 0.375, 0.375;
2471 2593
2472 my ($w, $h) = @$self{qw(w h)}; 2594 my ($w, $h) = @$self{qw(w h)};
2473 2595
2474 glColor 1, 0.8, 0.4; 2596 glColor 1, 0.8, 0.4;
… …
2485 glVertex 0 , $h; 2607 glVertex 0 , $h;
2486 glVertex $w, $h; 2608 glVertex $w, $h;
2487 glVertex $w, 0; 2609 glVertex $w, 0;
2488 glEnd; 2610 glEnd;
2489 2611
2490 glPopMatrix; 2612 glTranslate 2 - 0.375, 2 - 0.375;
2491
2492 glTranslate 2, 2;
2493 $self->SUPER::_draw; 2613 $self->SUPER::_draw;
2494} 2614}
2495 2615
2496############################################################################# 2616#############################################################################
2497 2617
… …
2502use CFClient::OpenGL; 2622use CFClient::OpenGL;
2503 2623
2504sub new { 2624sub new {
2505 my $class = shift; 2625 my $class = shift;
2506 2626
2507 $class->SUPER::new ( 2627 my $self = $class->SUPER::new (
2508 aspect => 1, 2628 aspect => 1,
2509 @_, 2629 @_,
2510 ) 2630 );
2631
2632 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self);
2634
2635 $self->{timer} = Event->timer (
2636 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2637 hard => 1,
2638 interval => $self->{animspeed},
2639 cb => sub {
2640 ++$widget->{frame};
2641 $widget->update;
2642 },
2643 );
2644 }
2645
2646 $self
2511} 2647}
2512 2648
2513sub size_request { 2649sub size_request {
2514 (32, 8) 2650 (32, 8)
2515} 2651}
2516 2652
2653sub update {
2654 my ($self) = @_;
2655
2656 return unless $self->{visible};
2657
2658 $self->SUPER::update;
2659}
2660
2517sub _draw { 2661sub _draw {
2518 my ($self) = @_; 2662 my ($self) = @_;
2519 2663
2520 return unless $::CONN;#d# manage and cache textures differently 2664 return unless $::CONN;
2665
2666 my $face;
2667
2668 if ($self->{frame}) {
2669 my $anim = $::CONN->{anim}[$self->{anim}];
2670
2671 $face = $anim->[ $self->{frame} % @$anim ]
2672 if $anim && @$anim;
2673 }
2674
2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2675 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2522 2676
2523 # TODO animation
2524 if ($tex) { 2677 if ($tex) {
2525 glEnable GL_BLEND;
2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2527 glEnable GL_TEXTURE_2D; 2678 glEnable GL_TEXTURE_2D;
2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2529 glColor 1, 1, 1, 1; 2680 glColor 1, 1, 1, 1;
2530 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2681 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2531 glDisable GL_TEXTURE_2D; 2682 glDisable GL_TEXTURE_2D;
2532 glDisable GL_BLEND;
2533 } 2683 }
2684}
2685
2686sub DESTROY {
2687 my ($self) = @_;
2688
2689 $self->{timer}->cancel
2690 if $self->{timer};
2691
2692 $self->SUPER::DESTROY;
2534} 2693}
2535 2694
2536############################################################################# 2695#############################################################################
2537 2696
2538package CFClient::UI::InventoryItem; 2697package CFClient::UI::InventoryItem;
2539 2698
2540our @ISA = CFClient::UI::HBox::; 2699our @ISA = CFClient::UI::HBox::;
2700
2701sub _item_to_desc {
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2541 2726
2542sub new { 2727sub new {
2543 my $class = shift; 2728 my $class = shift;
2544 2729
2545 my %args = @_; 2730 my %args = @_;
2546 2731
2547 my $item = $args{item}; 2732 my $item = delete $args{item};
2548 2733
2549 my $desc = $item->{nrof} < 2 2734 my $desc = _item_to_desc ($item);
2550 ? $item->{name}
2551 : "$item->{nrof} $item->{name_pl}";
2552
2553 2735
2554 my $self = $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2555 can_hover => 1, 2737 can_hover => 1,
2556 can_events => 1, 2738 can_events => 1,
2557 tooltip => (CFClient::UI::Label->escape ($desc) 2739 tooltip => ((CFClient::UI::Label::escape $desc)
2558 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2559 connect_button_down => sub { 2741 connect_button_down => sub {
2560 my ($self, $ev, $x, $y) = @_; 2742 my ($self, $ev, $x, $y) = @_;
2561 2743
2562 # todo: maybe put examine on 1? but should just be a tooltip :( 2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2563 if ($ev->{button} == 1) { 2753 } elsif ($ev->{button} == 1) {
2564 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2754 $::CONN->send ("examine $item->{tag}");
2565 } elsif ($ev->{button} == 2) { 2755 } elsif ($ev->{button} == 2) {
2566 $::CONN->send ("apply $item->{tag}"); 2756 $::CONN->send ("apply $item->{tag}");
2567 } elsif ($ev->{button} == 3) { 2757 } elsif ($ev->{button} == 3) {
2568 CFClient::UI::Menu->new ( 2758 my @menu_items = (
2569 items => [
2570 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2571 [
2572 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2573 sub { $::CONN->send ("lock $item->{tag}") },
2574 ],
2575 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2576 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2577 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2578 ], 2771 ),
2579 )->popup ($ev); 2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2580 } 2775 }
2581 2776
2582 1 2777 1
2583 }, 2778 },
2584 %args 2779 %args
2585 ); 2780 );
2781
2782
2586 $self->add(new CFClient::UI::Face 2783 $self->add (new CFClient::UI::Face
2587 can_events => 0, 2784 can_events => 0,
2588 face => $item->{face}, 2785 face => $item->{face},
2589 anim => $item->{anim}, 2786 anim => $item->{anim},
2590 animspeed => $item->{animspeed}); 2787 animspeed => $item->{animspeed},
2591 $self->add(new CFClient::UI::Label 2788 );
2592 can_events => 0, 2789
2593 text => $desc); 2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2594 2795
2595 $self 2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2596} 2805}
2597 2806
2598############################################################################# 2807#############################################################################
2599 2808
2600package CFClient::UI::Inventory; 2809package CFClient::UI::Inventory;
… …
2603 2812
2604sub new { 2813sub new {
2605 my $class = shift; 2814 my $class = shift;
2606 2815
2607 my $self = $class->SUPER::new ( 2816 my $self = $class->SUPER::new (
2608 scrolled => (new CFClient::UI::VBox), 2817 scrolled => (new CFClient::UI::Table),
2609 @_, 2818 @_,
2610 ); 2819 );
2611 2820
2612 $self 2821 $self
2613} 2822}
… …
2616 my ($self, $items) = @_; 2825 my ($self, $items) = @_;
2617 2826
2618 $self->{scrolled}->clear; 2827 $self->{scrolled}->clear;
2619 return unless $items; 2828 return unless $items;
2620 2829
2621 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2830 my @items = sort {
2831 ($a->{type} <=> $b->{type})
2832 or ($a->{name} cmp $b->{name})
2833 } @$items;
2622 2834
2623 $self->{real_items} = \@items; 2835 $self->{real_items} = \@items;
2624 2836
2625 for my $item (@items) { 2837 for my $item (@items) {
2626 my $desc = $item->{nrof} < 2 2838 $item->{item} = $item;
2627 ? $item->{name}
2628 : "$item->{nrof} $item->{name_pl}";
2629
2630 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842
2843 my $i = 0;
2844 for (@items) {
2845 $self->{scrolled}->add (0, $i, $_);
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2631 } 2848 }
2632 2849
2633# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2634} 2851}
2635 2852
… …
2678 2895
2679# popup given the event (must be a mouse button down event currently) 2896# popup given the event (must be a mouse button down event currently)
2680sub popup { 2897sub popup {
2681 my ($self, $ev) = @_; 2898 my ($self, $ev) = @_;
2682 2899
2683 $self->emit ("popdown"); 2900 $self->_emit ("popdown");
2684 2901
2685 # maybe save $GRAB? must be careful about events... 2902 # maybe save $GRAB? must be careful about events...
2686 $GRAB = $self; 2903 $GRAB = $self;
2687 $self->{button} = $ev->{button}; 2904 $self->{button} = $ev->{button};
2688 2905
… …
2703 2920
2704 if ($ev->{button} == $self->{button}) { 2921 if ($ev->{button} == $self->{button}) {
2705 undef $GRAB; 2922 undef $GRAB;
2706 $self->hide; 2923 $self->hide;
2707 2924
2708 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2709 $self->{hover}[1]->() if $self->{hover}; 2926 $self->{hover}[1]->() if $self->{hover};
2710 } 2927 }
2711} 2928}
2712 2929
2713############################################################################# 2930#############################################################################
2714 2931
2932package CFClient::UI::Statusbox;
2933
2934our @ISA = CFClient::UI::VBox::;
2935
2936sub new {
2937 my $class = shift;
2938
2939 $class->SUPER::new (
2940 fontsize => 0.8,
2941 @_,
2942 )
2943}
2944
2945sub reorder {
2946 my ($self) = @_;
2947 my $NOW = time;
2948
2949 while (my ($k, $v) = each %{ $self->{item} }) {
2950 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2951 }
2952
2953 my @widgets;
2954
2955 my @items = sort {
2956 $a->{pri} <=> $b->{pri}
2957 or $b->{id} <=> $a->{id}
2958 } values %{ $self->{item} };
2959
2960 my $count = 10 + 1;
2961 for my $item (@items) {
2962 last unless --$count;
2963
2964 push @widgets, $item->{label} ||= do {
2965 # TODO: doesn't handle markup well (read as: at all)
2966 my $short = $item->{count} > 1
2967 ? "<b>$item->{count} ×</b> $item->{text}"
2968 : $item->{text};
2969
2970 for ($short) {
2971 s/^\s+//;
2972 s/\s+/ /g;
2973 }
2974
2975 new CFClient::UI::Label
2976 markup => $short,
2977 tooltip => $item->{tooltip},
2978 tooltip_font => $::FONT_PROP,
2979 tooltip_width => 0.67,
2980 fontsize => $item->{fontsize} || $self->{fontsize},
2981 max_w => $::WIDTH * 0.44,
2982 fg => $item->{fg},
2983 can_events => 1,
2984 can_hover => 1
2985 };
2986 }
2987
2988 $self->clear;
2989 $self->SUPER::add (reverse @widgets);
2990}
2991
2992sub add {
2993 my ($self, $text, %arg) = @_;
2994
2995 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//;
2997
2998 my $timeout = time + ((delete $arg{timeout}) || 60);
2999
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001
3002 if (my $item = $self->{item}{$group}) {
3003 if ($item->{text} eq $text) {
3004 $item->{count}++;
3005 } else {
3006 $item->{count} = 1;
3007 $item->{text} = $item->{tooltip} = $text;
3008 }
3009 $item->{id} = ++$self->{id};
3010 $item->{timeout} = $timeout;
3011 delete $item->{label};
3012 } else {
3013 $self->{item}{$group} = {
3014 id => ++$self->{id},
3015 text => $text,
3016 timeout => $timeout,
3017 tooltip => $text,
3018 fg => [0.8, 0.8, 0.8, 0.8],
3019 pri => 0,
3020 count => 1,
3021 %arg,
3022 };
3023 }
3024
3025 $self->reorder;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 delete $_->{label}
3032 for values %{ $self->{item} || {} };
3033
3034 $self->reorder;
3035 $self->SUPER::reconfigure;
3036}
3037
3038#############################################################################
3039
2715package CFClient::UI::Root; 3040package CFClient::UI::Root;
2716 3041
2717our @ISA = CFClient::UI::Container::; 3042our @ISA = CFClient::UI::Container::;
2718 3043
2719use CFClient::OpenGL; 3044use CFClient::OpenGL;
2720 3045
3046sub new {
3047 my $class = shift;
3048
3049 $class->SUPER::new (
3050 @_,
3051 )
3052}
3053
3054sub configure {
3055 my ($self, $x, $y, $w, $h) = @_;
3056
3057 $self->{w} = $w;
3058 $self->{h} = $h;
3059}
3060
2721sub check_size { 3061sub check_size {
2722 my ($self) = @_; 3062 my ($self) = @_;
2723 3063
2724 $self->configure (0, 0, $self->{w}, $self->{h}); 3064 $self->size_allocate ($self->{w}, $self->{h})
3065 if $self->{w};
2725} 3066}
2726 3067
2727sub size_request { 3068sub size_request {
2728 my ($self) = @_; 3069 my ($self) = @_;
2729 3070
… …
2731} 3072}
2732 3073
2733sub size_allocate { 3074sub size_allocate {
2734 my ($self, $w, $h) = @_; 3075 my ($self, $w, $h) = @_;
2735 3076
2736 my $old_w = $self->{old_w};
2737 my $old_h = $self->{old_h};
2738
2739 if ($old_w && $old_h) {
2740 for my $child ($self->children) {
2741 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2742 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2743 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2744 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2745 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2746 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2747 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2748 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2749 }
2750 }
2751
2752 $self->{old_w} = $w;
2753 $self->{old_h} = $h;
2754}
2755
2756sub configure {
2757 my ($self, $x, $y, $w, $h) = @_;
2758
2759 $self->SUPER::configure ($x, $y, $w, $h);
2760
2761 for my $child ($self->children) { 3077 for my $child ($self->children) {
2762 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2763 3079
3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3081 if exists $child->{req_x};
3082
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3084 if exists $child->{req_y};
3085
2764 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3086 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2765 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3087 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088
2766 $child->configure ($X, $Y, $W, $H); 3089 $child->configure ($X, $Y, $W, $H);
2767 } 3090 }
2768} 3091}
2769 3092
2770sub _topleft { 3093sub coord2local {
2771 my ($self, $x, $y) = @_; 3094 my ($self, $x, $y) = @_;
2772 3095
2773 ($x, $y) 3096 ($x, $y)
2774} 3097}
2775 3098
3099sub coord2global {
3100 my ($self, $x, $y) = @_;
3101
3102 ($x, $y)
3103}
3104
2776sub update { 3105sub update {
2777 my ($self) = @_; 3106 my ($self) = @_;
2778 3107
2779 $self->check_size; 3108 $self->check_size;
2780 ::refresh (); 3109 $::WANT_REFRESH++;
2781} 3110}
2782 3111
2783sub add { 3112sub add {
2784 my ($self, $child) = @_; 3113 my ($self, @children) = @_;
2785 3114
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120
3121 for my $child (@children) {
3122 $child->{is_toplevel} = 1;
3123
2786 # integerize window positions 3124 # integerise window positions
2787 $child->{x} = int $child->{x}; 3125 $child->{x} = int $child->{x};
2788 $child->{y} = int $child->{y}; 3126 $child->{y} = int $child->{y};
3127 }
2789 3128
2790 $self->SUPER::add ($child); 3129 $self->SUPER::add (@children);
3130}
3131
3132sub remove {
3133 my ($self, @children) = @_;
3134
3135 $self->SUPER::remove (@children);
3136
3137 while (@children) {
3138 my $w = pop @children;
3139 push @children, $w->children;
3140 $w->set_invisible;
3141 }
2791} 3142}
2792 3143
2793sub on_refresh { 3144sub on_refresh {
2794 my ($self, $id, $cb) = @_; 3145 my ($self, $id, $cb) = @_;
2795 3146
2796 $self->{refresh_hook}{$id} = $cb; 3147 $self->{refresh_hook}{$id} = $cb;
2797} 3148}
2798 3149
3150sub on_post_alloc {
3151 my ($self, $id, $cb) = @_;
3152
3153 $self->{post_alloc_hook}{$id} = $cb;
3154}
3155
2799sub draw { 3156sub draw {
2800 my ($self) = @_; 3157 my ($self) = @_;
2801 3158
2802 while (my $rcb = delete $self->{refresh_hook}) { 3159 while ($self->{refresh_hook}) {
2803 $_->() for values %$rcb; 3160 $_->()
3161 for values %{delete $self->{refresh_hook}};
3162 }
3163
3164 if ($self->{check_size}) {
3165 my @queue = ([], []);
3166
3167 for (;;) {
3168 if ($self->{check_size}) {
3169 # heuristic: check containers last
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3171 for values %{delete $self->{check_size}}
3172 }
3173
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3175
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3177 ? @$widget{qw(user_w user_h)}
3178 : $widget->size_request;
3179
3180 if (delete $widget->{force_alloc}
3181 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3182 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3183
3184 $widget->{req_w} = $w;
3185 $widget->{req_h} = $h;
3186
3187 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3188
3189 $widget->{parent}->check_size
3190 if $widget->{parent};
3191 }
3192 }
3193 }
3194
3195 while ($self->{size_alloc}) {
3196 for (values %{delete $self->{size_alloc}}) {
3197 my ($widget, $w, $h) = @$_;
3198
3199 $w = 0 if $w < 0;
3200 $h = 0 if $h < 0;
3201
3202 $widget->{w} = $w;
3203 $widget->{h} = $h;
3204 $widget->emit (size_allocate => $w, $h);
3205 }
3206 }
3207
3208 while ($self->{post_alloc_hook}) {
3209 $_->()
3210 for values %{delete $self->{post_alloc_hook}};
2804 } 3211 }
2805 3212
2806 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3213 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2807 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3214 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2808 glClear GL_COLOR_BUFFER_BIT; 3215 glClear GL_COLOR_BUFFER_BIT;
2809 3216
2810 glMatrixMode GL_PROJECTION; 3217 glMatrixMode GL_PROJECTION;
2811 glLoadIdentity; 3218 glLoadIdentity;
2812 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2813 glMatrixMode GL_MODELVIEW; 3220 glMatrixMode GL_MODELVIEW;
2814 glLoadIdentity; 3221 glLoadIdentity;
2815 3222
2816 $self->_draw; 3223 $self->_draw;
2817} 3224}
… …
2819############################################################################# 3226#############################################################################
2820 3227
2821package CFClient::UI; 3228package CFClient::UI;
2822 3229
2823$ROOT = new CFClient::UI::Root; 3230$ROOT = new CFClient::UI::Root;
2824$TOOLTIP = new CFClient::UI::Tooltip; 3231$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2825 3232
28261 32331
2827 3234

Diff Legend

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