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.236 by root, Thu May 25 16:54:29 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 $tooltip =~ s/^\s+//;
277 or Carp::confess "no parent widget in _topleft\n";#d# 328 $tooltip =~ s/\s+$//;
278 329
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 330 return if $self->{tooltip} eq $tooltip;
331
332 $self->{tooltip} = $tooltip;
333
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip;
337 }
280} 338}
281 339
282# translate global coordinates to local coordinate system 340# translate global coordinates to local coordinate system
283sub coord2local { 341sub coord2local {
284 my ($self, $x, $y) = @_; 342 my ($self, $x, $y) = @_;
285 343
286 my ($X, $Y) = $self->_topleft; 344 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 345}
289 346
290# translate local coordinates to global coordinate system 347# translate local coordinates to global coordinate system
291sub coord2global { 348sub coord2global {
292 my ($self, $x, $y) = @_; 349 my ($self, $x, $y) = @_;
293 350
294 my ($X, $Y) = $self->_topleft; 351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 352}
297 353
298sub focus_in { 354sub focus_in {
299 my ($self) = @_; 355 my ($self) = @_;
300 356
301 return if $FOCUS == $self; 357 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
303 359
304 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
305 361
306 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
307 363
308 $focus->update if $focus; 364 $focus->update if $focus;
309 $FOCUS->update; 365 $FOCUS->update;
310} 366}
311 367
… …
314 370
315 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
316 372
317 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
318 374
319 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
320 376
321 $focus->update if $focus; #? 377 $focus->update if $focus; #?
378
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS;
322} 381}
323 382
324sub mouse_motion { } 383sub mouse_motion { }
325sub button_up { } 384sub button_up { }
326sub key_down { } 385sub key_down { }
327sub key_up { } 386sub key_up { }
328 387
329sub button_down { 388sub button_down {
330 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
331 390
332 $self->focus_in; 391 $self->focus_in;
… …
366 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix; 426 glPushMatrix;
368 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 430 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
373 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
374 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
375 glEnd; 434 glEnd;
376 glPopMatrix; 435 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 437 }
379} 438}
380 439
381sub _draw { 440sub _draw {
382 my ($self) = @_; 441 my ($self) = @_;
… …
398 457
399sub set_parent { 458sub set_parent {
400 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
401 460
402 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
403} 468}
404 469
405sub check_size { 470sub check_size {
406 my ($self) = @_; 471 my ($self, $forced) = @_;
407 472
408 $self->_check_size; 473 $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}; 474 $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} 475}
451 476
452sub update { 477sub update {
453 my ($self) = @_; 478 my ($self) = @_;
454 479
455 my $update = $CFClient::UI::ROOT->{_update} ||= {}; 480 $self->{parent}->update
456 481 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} 482}
469 483
470sub connect { 484sub connect {
471 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
472 486
473 push @{ $self->{signal_cb}{$signal} }, $cb; 487 push @{ $self->{signal_cb}{$signal} }, $cb;
474} 488}
475 489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
476sub emit { 496sub emit {
477 my ($self, $signal, @args) = @_; 497 my ($self, $signal, @args) = @_;
478 498
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
480} 501}
481 502
482sub DESTROY { 503sub DESTROY {
483 my ($self) = @_; 504 my ($self) = @_;
484 505
506 delete $WIDGET{$self+0};
485 #$self->deactivate; 507 #$self->deactivate;
486} 508}
487 509
488############################################################################# 510#############################################################################
489 511
… …
498 my $class = shift; 520 my $class = shift;
499 521
500 # range [value, low, high, page] 522 # range [value, low, high, page]
501 523
502 $class->SUPER::new ( 524 $class->SUPER::new (
503 bg => [0, 0, 0, 0.2], 525 #bg => [0, 0, 0, 0.2],
504 active_bg => [1, 1, 1, 0.5], 526 #active_bg => [1, 1, 1, 0.5],
505 @_ 527 @_
506 ) 528 )
507} 529}
508 530
509sub _draw { 531sub _draw {
510 my ($self) = @_; 532 my ($self) = @_;
511 533
534 my $color = $FOCUS == $self && $self->{active_bg}
535 ? $self->{active_bg}
536 : $self->{bg};
537
538 if ($color && (@$color < 4 || $color->[3])) {
512 my ($w, $h) = @$self{qw(w h)}; 539 my ($w, $h) = @$self{qw(w h)};
513 540
514 glEnable GL_BLEND; 541 glEnable GL_BLEND;
515 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
516 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 543 glColor @$color;
517 544
518 glBegin GL_QUADS; 545 glBegin GL_QUADS;
519 glVertex 0 , 0; 546 glVertex 0 , 0;
520 glVertex 0 , $h; 547 glVertex 0 , $h;
521 glVertex $w, $h; 548 glVertex $w, $h;
522 glVertex $w, 0; 549 glVertex $w, 0;
523 glEnd; 550 glEnd;
524 551
525 glDisable GL_BLEND; 552 glDisable GL_BLEND;
553 }
526} 554}
527 555
528############################################################################# 556#############################################################################
529 557
530package CFClient::UI::Empty; 558package CFClient::UI::Empty;
… …
574 $self->{children} = [ 602 $self->{children} = [
575 sort { $a->{z} <=> $b->{z} } 603 sort { $a->{z} <=> $b->{z} }
576 @{$self->{children}}, @widgets 604 @{$self->{children}}, @widgets
577 ]; 605 ];
578 606
579 $_->check_size 607 $self->check_size (1);
580 for @widgets;
581
582 $self->update; 608 $self->update;
583} 609}
584 610
585sub children { 611sub children {
586 @{ $_[0]{children} } 612 @{ $_[0]{children} }
… …
592 delete $child->{parent}; 618 delete $child->{parent};
593 $child->hide; 619 $child->hide;
594 620
595 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
596 622
597 $self->check_size; 623 $self->check_size (1);
598 $self->update; 624 $self->update;
599} 625}
600 626
601sub clear { 627sub clear {
602 my ($self) = @_; 628 my ($self) = @_;
… …
693} 719}
694 720
695sub update { 721sub update {
696 my ($self) = @_; 722 my ($self) = @_;
697 723
698 $ROOT->on_refresh ($self => sub { $self->render_child }); 724 $ROOT->on_post_alloc ($self => sub { $self->render_child });
699 $self->SUPER::update; 725 $self->SUPER::update;
700} 726}
701 727
702sub size_allocate { 728sub size_allocate {
703 my ($self, $w, $h) = @_; 729 my ($self, $w, $h) = @_;
… …
716 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 742 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
717 glClearColor 0, 0, 0, 0; 743 glClearColor 0, 0, 0, 0;
718 glClear GL_COLOR_BUFFER_BIT; 744 glClear GL_COLOR_BUFFER_BIT;
719 745
720 $self->_render; 746 $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 }; 747 };
729} 748}
730 749
731sub _draw { 750sub _draw {
732 my ($self) = @_; 751 my ($self) = @_;
… …
734 my ($w, $h) = ($self->w, $self->h); 753 my ($w, $h) = ($self->w, $self->h);
735 754
736 my $tex = $self->{texture} 755 my $tex = $self->{texture}
737 or return; 756 or return;
738 757
739 glEnable GL_BLEND;
740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 758 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743 glColor 0, 0, 0, 1; 760 glColor 1, 1, 1, 1;
744 761
745 $tex->draw_quad (0, 0, $w, $h); 762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
746 763
747 glDisable GL_BLEND;
748 glDisable GL_TEXTURE_2D; 764 glDisable GL_TEXTURE_2D;
749} 765}
750 766
751############################################################################# 767#############################################################################
752 768
753package CFClient::UI::ViewPort; 769package CFClient::UI::ViewPort;
754 770
755our @ISA = CFClient::UI::Window::; 771our @ISA = CFClient::UI::Window::;
756 772
773sub new {
774 my $class = shift;
775
776 $class->SUPER::new (
777 scroll_x => 0,
778 scroll_y => 1,
779 @_,
780 )
781}
782
757sub size_request { 783sub size_request {
758 my ($self) = @_; 784 my ($self) = @_;
759 785
760 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 786 @$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 787
763 @$self{qw(child_w child_h)} 788 @$self{qw(child_w child_h)}
764} 789}
765 790
766sub size_allocate { 791sub size_allocate {
767 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
768 793
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
796
797 $self->child->configure (0, 0, $w, $h);
769 $self->update; 798 $self->update;
770} 799}
771 800
772sub set_offset { 801sub set_offset {
773 my ($self, $x, $y) = @_; 802 my ($self, $x, $y) = @_;
… …
776 $self->{view_y} = int $y; 805 $self->{view_y} = int $y;
777 806
778 $self->update; 807 $self->update;
779} 808}
780 809
781# hmm, this does not work for topleft of $self... but we should not aks for that 810# hmm, this does not work for topleft of $self... but we should not ask for that
782sub _topleft { 811sub coord2local {
783 my ($self, $x, $y) = @_; 812 my ($self, $x, $y) = @_;
784 813
785 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 814 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
815}
816
817sub coord2global {
818 my ($self, $x, $y) = @_;
819
820 $x = List::Util::min $self->{w}, $x - $self->{view_x};
821 $y = List::Util::min $self->{h}, $y - $self->{view_y};
822
823 $self->SUPER::coord2global ($x, $y)
786} 824}
787 825
788sub find_widget { 826sub find_widget {
789 my ($self, $x, $y) = @_; 827 my ($self, $x, $y) = @_;
790 828
… …
818 856
819 my $slider = new CFClient::UI::Slider 857 my $slider = new CFClient::UI::Slider
820 vertical => 1, 858 vertical => 1,
821 range => [0, 0, 1, 0.01], # HACK fix 859 range => [0, 0, 1, 0.01], # HACK fix
822 connect_changed => sub { 860 connect_changed => sub {
823 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 861 $self->{vp}->set_offset (0, $_[1]);
824 }, 862 },
825 ; 863 ;
826 864
827 $self = $class->SUPER::new ( 865 $self = $class->SUPER::new (
828 vp => (new CFClient::UI::ViewPort), 866 vp => (new CFClient::UI::ViewPort expand => 1),
829 slider => $slider, 867 slider => $slider,
830 @_, 868 @_,
831 ); 869 );
832 870
833 $self->{vp}->add ($self->{scrolled}); 871 $self->{vp}->add ($self->{scrolled});
… …
835 $self->add ($self->{slider}); 873 $self->add ($self->{slider});
836 874
837 $self 875 $self
838} 876}
839 877
878sub size_allocate {
879 my ($self, $w, $h) = @_;
880
881 $self->SUPER::size_allocate ($w, $h);
882
883 my $child = $self->{vp}->child;
884 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
885}
886
840#TODO# update range on size_allocate depeneing on child 887#TODO# update range on size_allocate depending on child
841# update viewport offset on scroll 888# update viewport offset on scroll
842 889
843############################################################################# 890#############################################################################
844 891
845package CFClient::UI::Frame; 892package CFClient::UI::Frame;
… …
849use CFClient::OpenGL; 896use CFClient::OpenGL;
850 897
851sub new { 898sub new {
852 my $class = shift; 899 my $class = shift;
853 900
854 my $self = $class->SUPER::new ( 901 $class->SUPER::new (
855 bg => [1, 1, 1, 1], 902 bg => undef,
856 border_bg => [1, 1, 1, 1],
857 border => 0.8,
858 @_ 903 @_,
859 ); 904 )
860
861 $self
862} 905}
863 906
864sub _draw { 907sub _draw {
865 my ($self) = @_; 908 my ($self) = @_;
866 909
867 my ($w, $h) = ($self->{w}, $self->{h}); 910 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)};
868 912
869 glEnable GL_BLEND; 913 glEnable GL_BLEND;
870 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
871 glEnable GL_TEXTURE_2D; 915 glColor @{ $self->{bg} };
872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
873 916
874# glBegin GL_QUADS; 917 glBegin GL_QUADS;
875# glColor 0, 0, 0, 0;
876# glVertex 0 , 0; 918 glVertex 0 , 0;
877# glVertex 0 , $h; 919 glVertex 0 , $h;
878# glVertex $w, $h; 920 glVertex $w, $h;
879# glVertex $w, 0; 921 glVertex $w, 0;
880# glEnd; 922 glEnd;
881 923
882
883 $self->child->draw;
884 glDisable GL_BLEND; 924 glDisable GL_BLEND;
885 glDisable GL_TEXTURE_2D; 925 }
926
927 $self->SUPER::_draw;
886} 928}
887 929
888############################################################################# 930#############################################################################
889 931
890package CFClient::UI::FancyFrame; 932package CFClient::UI::FancyFrame;
… …
901 my $class = shift; 943 my $class = shift;
902 944
903 # TODO: user_x, user_y, overwrite moveto? 945 # TODO: user_x, user_y, overwrite moveto?
904 946
905 my $self = $class->SUPER::new ( 947 my $self = $class->SUPER::new (
906 bg => [1, 1, 1, 1], 948 bg => [1, 1, 1, 1],
907 border_bg => [1, 1, 1, 1], 949 border_bg => [1, 1, 1, 1],
908 border => 0.6, 950 border => 0.6,
951 is_toplevel => 1,
909 can_events => 1, 952 can_events => 1,
910 @_ 953 @_
911 ); 954 );
912 955
913 $self->{title} &&= new CFClient::UI::Label 956 $self->{title} &&= new CFClient::UI::Label
914 align => 0, 957 align => 0,
… …
938 my ($self, $w, $h) = @_; 981 my ($self, $w, $h) = @_;
939 982
940 $h -= List::Util::max 0, $self->border * 2; 983 $h -= List::Util::max 0, $self->border * 2;
941 $w -= List::Util::max 0, $self->border * 2; 984 $w -= List::Util::max 0, $self->border * 2;
942 985
943 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
944 if $self->{title}; 987 if $self->{title};
945 988
946 $self->child->configure ($self->border, $self->border, $w, $h); 989 $self->child->configure ($self->border, $self->border, $w, $h);
947} 990}
948 991
… …
1006 my ($self) = @_; 1049 my ($self) = @_;
1007 1050
1008 my ($w, $h ) = ($self->{w}, $self->{h}); 1051 my ($w, $h ) = ($self->{w}, $self->{h});
1009 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1010 1053
1011 glEnable GL_BLEND;
1012 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1013 glEnable GL_TEXTURE_2D; 1054 glEnable GL_TEXTURE_2D;
1014 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1015 1056
1016 my $border = $self->border; 1057 my $border = $self->border;
1017 1058
1018 glColor @{ $self->{border_bg} }; 1059 glColor @{ $self->{border_bg} };
1019 $tex[1]->draw_quad (0, 0, $w, $border); 1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
1020 $tex[3]->draw_quad (0, $border, $border, $ch); 1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1022 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1023 1064
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1025 my $bg = $tex[0]; 1066 my $bg = $tex[0];
1026 1067
1027 # TODO: repeat texture not scale 1068 # TODO: repeat texture not scale
… …
1031 glColor @{ $self->{bg} }; 1072 glColor @{ $self->{bg} };
1032 1073
1033 $bg->{s} = $rep_x; 1074 $bg->{s} = $rep_x;
1034 $bg->{t} = $rep_y; 1075 $bg->{t} = $rep_y;
1035 $bg->{wrap_mode} = 1; 1076 $bg->{wrap_mode} = 1;
1036 $bg->draw_quad ($border, $border, $cw, $ch); 1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 }
1037 1079
1038 glDisable GL_TEXTURE_2D; 1080 glDisable GL_TEXTURE_2D;
1039 glDisable GL_BLEND;
1040 }
1041 1081
1042 $self->{title}->draw if $self->{title}; 1082 $self->{title}->draw if $self->{title};
1043 1083
1044 $self->child->draw; 1084 $self->child->draw;
1045} 1085}
… …
1057sub new { 1097sub new {
1058 my $class = shift; 1098 my $class = shift;
1059 1099
1060 $class->SUPER::new ( 1100 $class->SUPER::new (
1061 col_expand => [], 1101 col_expand => [],
1062 @_ 1102 @_,
1063 ) 1103 )
1104}
1105
1106sub children {
1107 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1064} 1108}
1065 1109
1066sub add { 1110sub add {
1067 my ($self, $x, $y, $child) = @_; 1111 my ($self, $x, $y, $child) = @_;
1068 1112
1069 $child->set_parent ($self); 1113 $child->set_parent ($self);
1070 $self->{children}[$y][$x] = $child; 1114 $self->{children}[$y][$x] = $child;
1071 1115
1072 $child->check_size; 1116 $self->check_size (1);
1073} 1117}
1074 1118
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
1079# TODO: move to container class maybe? send childs a signal on removal? 1119# TODO: move to container class maybe? send children a signal on removal?
1080sub clear { 1120sub clear {
1081 my ($self) = @_; 1121 my ($self) = @_;
1082 1122
1083 my @children = $self->children; 1123 my @children = $self->children;
1084 delete $self->{children}; 1124 delete $self->{children};
… …
1086 for (@children) { 1126 for (@children) {
1087 delete $_->{parent}; 1127 delete $_->{parent};
1088 $_->hide; 1128 $_->hide;
1089 } 1129 }
1090 1130
1131 $self->check_size (1);
1091 $self->update; 1132 $self->update;
1092} 1133}
1093 1134
1094sub get_wh { 1135sub get_wh {
1095 my ($self) = @_; 1136 my ($self) = @_;
… …
1272} 1313}
1273 1314
1274sub size_allocate { 1315sub size_allocate {
1275 my ($self, $w, $h) = @_; 1316 my ($self, $w, $h) = @_;
1276 1317
1318 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1319
1277 my $children = $self->{children}; 1320 my $children = $self->{children};
1278 1321
1279 my @h = map $_->{req_h}, @$children; 1322 my @h = map $_->{req_h}, @$children;
1280 1323
1281 my $req_h = List::Util::sum @h; 1324 my $req_h = List::Util::sum @h;
… …
1310 1353
1311############################################################################# 1354#############################################################################
1312 1355
1313package CFClient::UI::Label; 1356package CFClient::UI::Label;
1314 1357
1315our @ISA = CFClient::UI::Base::; 1358our @ISA = CFClient::UI::DrawBG::;
1316 1359
1317use CFClient::OpenGL; 1360use CFClient::OpenGL;
1318 1361
1319sub new { 1362sub new {
1320 my ($class, %arg) = @_; 1363 my ($class, %arg) = @_;
1321 1364
1322 my $self = $class->SUPER::new ( 1365 my $self = $class->SUPER::new (
1323 fg => [1, 1, 1], 1366 fg => [1, 1, 1],
1367 #bg => none
1368 #active_bg => none
1324 #font => default_font 1369 #font => default_font
1370 #text => initial text
1371 #markup => initial narkup
1372 #max_w => maximum pixel width
1373 ellipsise => 3, # end
1374 layout => (new CFClient::Layout),
1325 fontsize => 1, 1375 fontsize => 1,
1326 text => "",
1327 align => -1, 1376 align => -1,
1328 valign => -1, 1377 valign => -1,
1329 padding => 2, 1378 padding => 2,
1330 layout => new CFClient::Layout,
1331 can_events => 0, 1379 can_events => 0,
1332 %arg 1380 %arg
1333 ); 1381 );
1334 1382
1335 if (exists $self->{template}) { 1383 if (exists $self->{template}) {
1336 my $layout = new CFClient::Layout; 1384 my $layout = new CFClient::Layout;
1337 $layout->set_text (delete $self->{template}); 1385 $layout->set_text (delete $self->{template});
1338 $self->{template} = $layout; 1386 $self->{template} = $layout;
1339 } 1387 }
1340 1388
1341 $self->set_text (delete $self->{text}) if exists $self->{text}; 1389 if (exists $self->{markup}) {
1342 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1390 $self->set_markup (delete $self->{markup});
1391 } else {
1392 $self->set_text (delete $self->{text});
1393 }
1343 1394
1344 $self 1395 $self
1345} 1396}
1346 1397
1347sub escape { 1398sub escape($) {
1348 local $_ = $_[1]; 1399 local $_ = $_[0];
1349 1400
1350 s/&/&amp;/g; 1401 s/&/&amp;/g;
1351 s/>/&gt;/g; 1402 s/>/&gt;/g;
1352 s/</&lt;/g; 1403 s/</&lt;/g;
1353 1404
1354 $_[1] 1405 $_
1355} 1406}
1356 1407
1357sub update { 1408sub update {
1358 my ($self) = @_; 1409 my ($self) = @_;
1359 1410
… …
1365 my ($self, $text) = @_; 1416 my ($self, $text) = @_;
1366 1417
1367 return if $self->{text} eq "T$text"; 1418 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text"; 1419 $self->{text} = "T$text";
1369 1420
1421 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1422 $self->{layout}->set_text ($text);
1371 1423
1372 delete $self->{texture};
1373 $self->update; 1424 $self->update;
1374 $self->check_size; 1425 $self->check_size;
1375} 1426}
1376 1427
1377sub set_markup { 1428sub set_markup {
1378 my ($self, $markup) = @_; 1429 my ($self, $markup) = @_;
1379 1430
1380 return if $self->{text} eq "M$markup"; 1431 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup"; 1432 $self->{text} = "M$markup";
1382 1433
1434 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1435
1436 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1383 $self->{layout}->set_markup ($markup); 1437 $self->{layout}->set_markup ($markup);
1384 1438
1385 delete $self->{texture};
1386 $self->update; 1439 $self->update;
1387 $self->check_size; 1440 $self->check_size;
1388} 1441}
1389 1442
1390sub size_request { 1443sub size_request {
1391 my ($self) = @_; 1444 my ($self) = @_;
1392 1445
1393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1446 $self->{layout}->set_font ($self->{font}) if $self->{font};
1394 $self->{layout}->set_width ($self->{max_w} || -1); 1447 $self->{layout}->set_width ($self->{max_w} || -1);
1448 $self->{layout}->set_ellipsise ($self->{ellipsise});
1449 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1450 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1396 1451
1397 my ($w, $h) = $self->{layout}->size; 1452 my ($w, $h) = $self->{layout}->size;
1398 1453
1399 if (exists $self->{template}) { 1454 if (exists $self->{template}) {
… …
1429} 1484}
1430 1485
1431sub _draw { 1486sub _draw {
1432 my ($self) = @_; 1487 my ($self) = @_;
1433 1488
1489 $self->SUPER::_draw; # draw background, if applicable
1490
1434 my $tex = $self->{texture} ||= do { 1491 my $tex = $self->{texture} ||= do {
1492 $self->{layout}->set_foreground (@{$self->{fg}});
1435 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1493 $self->{layout}->set_font ($self->{font}) if $self->{font};
1436 $self->{layout}->set_width ($self->{w}); 1494 $self->{layout}->set_width ($self->{w});
1495 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1437 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498
1438 new_from_layout CFClient::Texture $self->{layout} 1499 my $tex = new_from_layout CFClient::Texture $self->{layout};
1500
1501 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1502 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1503 : ($self->{w} - $tex->{w}) * 0.5);
1504
1505 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1506 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1507 : ($self->{h} - $tex->{h}) * 0.5);
1508
1509 $tex
1439 }; 1510 };
1440 1511
1441 glEnable GL_BLEND;
1442 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1443 glEnable GL_TEXTURE_2D; 1512 glEnable GL_TEXTURE_2D;
1444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1445 1514
1515 if ($tex->{format} == GL_ALPHA) {
1446 glColor @{$self->{fg}}; 1516 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}); 1517 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1518 } else {
1519 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1520 }
1461 1521
1462 glDisable GL_TEXTURE_2D; 1522 glDisable GL_TEXTURE_2D;
1463 glDisable GL_BLEND;
1464} 1523}
1465 1524
1466############################################################################# 1525#############################################################################
1467 1526
1468package CFClient::UI::EntryBase; 1527package CFClient::UI::EntryBase;
… …
1481 active_fg => [0, 0, 0], 1540 active_fg => [0, 0, 0],
1482 can_hover => 1, 1541 can_hover => 1,
1483 can_focus => 1, 1542 can_focus => 1,
1484 valign => 0, 1543 valign => 0,
1485 can_events => 1, 1544 can_events => 1,
1545 #text => ...
1486 @_ 1546 @_
1487 ) 1547 )
1488} 1548}
1489 1549
1490sub _set_text { 1550sub _set_text {
… …
1500 $self->{text} = $text; 1560 $self->{text} = $text;
1501 1561
1502 $text =~ s/./*/g if $self->{hidden}; 1562 $text =~ s/./*/g if $self->{hidden};
1503 $self->{layout}->set_text ("$text "); 1563 $self->{layout}->set_text ("$text ");
1504 1564
1505 $self->emit (changed => $self->{text}); 1565 $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} 1566}
1525 1567
1526sub set_text { 1568sub set_text {
1527 my ($self, $text) = @_; 1569 my ($self, $text) = @_;
1528 1570
1529 $self->{cursor} = length $text; 1571 $self->{cursor} = length $text;
1530 $self->_set_text ($text); 1572 $self->_set_text ($text);
1531 $self->update; 1573 $self->update;
1574 $self->check_size;
1575}
1576
1577sub get_text {
1578 $_[0]{text}
1579}
1580
1581sub size_request {
1582 my ($self) = @_;
1583
1584 my ($w, $h) = $self->SUPER::size_request;
1585
1586 ($w + 1, $h) # add 1 for cursor
1532} 1587}
1533 1588
1534sub key_down { 1589sub key_down {
1535 my ($self, $ev) = @_; 1590 my ($self, $ev) = @_;
1536 1591
… …
1538 my $sym = $ev->{sym}; 1593 my $sym = $ev->{sym};
1539 my $uni = $ev->{unicode}; 1594 my $uni = $ev->{unicode};
1540 1595
1541 my $text = $self->get_text; 1596 my $text = $self->get_text;
1542 1597
1543 if ($sym == 8) { 1598 if ($uni == 8) {
1544 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1599 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1545 } elsif ($sym == 127) { 1600 } elsif ($uni == 127) {
1546 substr $text, $self->{cursor}, 1, ""; 1601 substr $text, $self->{cursor}, 1, "";
1547 } elsif ($sym == CFClient::SDLK_LEFT) { 1602 } elsif ($sym == CFClient::SDLK_LEFT) {
1548 --$self->{cursor} if $self->{cursor}; 1603 --$self->{cursor} if $self->{cursor};
1549 } elsif ($sym == CFClient::SDLK_RIGHT) { 1604 } elsif ($sym == CFClient::SDLK_RIGHT) {
1550 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1605 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1551 } elsif ($sym == CFClient::SDLK_HOME) { 1606 } elsif ($sym == CFClient::SDLK_HOME) {
1552 $self->{cursor} = 0; 1607 $self->{cursor} = 0;
1553 } elsif ($sym == CFClient::SDLK_END) { 1608 } elsif ($sym == CFClient::SDLK_END) {
1554 $self->{cursor} = length $text; 1609 $self->{cursor} = length $text;
1555 } elsif ($sym == 27) { 1610 } elsif ($uni == 27) {
1556 $self->emit ('escape'); 1611 $self->_emit ('escape');
1557 } elsif ($uni) { 1612 } elsif ($uni) {
1558 substr $text, $self->{cursor}++, 0, chr $uni; 1613 substr $text, $self->{cursor}++, 0, chr $uni;
1559 } 1614 }
1560 1615
1561 $self->_set_text ($text); 1616 $self->_set_text ($text);
1562 $self->update; 1617 $self->update;
1618 $self->check_size;
1563} 1619}
1564 1620
1565sub focus_in { 1621sub focus_in {
1566 my ($self) = @_; 1622 my ($self) = @_;
1567 1623
… …
1647 if ($sym == 13) { 1703 if ($sym == 13) {
1648 unshift @{$self->{history}}, 1704 unshift @{$self->{history}},
1649 my $txt = $self->get_text; 1705 my $txt = $self->get_text;
1650 $self->{history_pointer} = -1; 1706 $self->{history_pointer} = -1;
1651 $self->{history_saveback} = ''; 1707 $self->{history_saveback} = '';
1652 $self->emit (activate => $txt); 1708 $self->_emit (activate => $txt);
1653 $self->update; 1709 $self->update;
1654 1710
1655 } elsif ($sym == CFClient::SDLK_UP) { 1711 } elsif ($sym == CFClient::SDLK_UP) {
1656 if ($self->{history_pointer} < 0) { 1712 if ($self->{history_pointer} < 0) {
1657 $self->{history_saveback} = $self->get_text; 1713 $self->{history_saveback} = $self->get_text;
… …
1696 my $class = shift; 1752 my $class = shift;
1697 1753
1698 $class->SUPER::new ( 1754 $class->SUPER::new (
1699 padding => 4, 1755 padding => 4,
1700 fg => [1, 1, 1], 1756 fg => [1, 1, 1],
1701 bg => [1, 1, 1, 0.2],
1702 active_fg => [0, 0, 1], 1757 active_fg => [0, 0, 1],
1703 can_hover => 1, 1758 can_hover => 1,
1704 align => 0, 1759 align => 0,
1705 valign => 0, 1760 valign => 0,
1706 can_events => 1, 1761 can_events => 1,
1707 @_ 1762 @_
1708 ) 1763 )
1709} 1764}
1710 1765
1766sub activate { }
1767
1711sub button_up { 1768sub button_up {
1712 my ($self, $ev, $x, $y) = @_; 1769 my ($self, $ev, $x, $y) = @_;
1713 1770
1771 $self->emit ("activate")
1714 if ($x >= 0 && $x < $self->{w} 1772 if $x >= 0 && $x < $self->{w}
1715 && $y >= 0 && $y < $self->{h}) { 1773 && $y >= 0 && $y < $self->{h};
1716 $self->emit ("activate");
1717 }
1718} 1774}
1719 1775
1720sub _draw { 1776sub _draw {
1721 my ($self) = @_; 1777 my ($self) = @_;
1722 1778
… …
1724 1780
1725 if ($GRAB == $self) { 1781 if ($GRAB == $self) {
1726 $self->{fg} = $self->{active_fg}; 1782 $self->{fg} = $self->{active_fg};
1727 } 1783 }
1728 1784
1729 glEnable GL_BLEND;
1730 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1731 glEnable GL_TEXTURE_2D; 1785 glEnable GL_TEXTURE_2D;
1732 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1786 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1733 glColor 0, 0, 0, 1; 1787 glColor 0, 0, 0, 1;
1734 1788
1735 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1789 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1736 1790
1737 glDisable GL_TEXTURE_2D; 1791 glDisable GL_TEXTURE_2D;
1738 glDisable GL_BLEND;
1739 1792
1740 $self->SUPER::_draw; 1793 $self->SUPER::_draw;
1741} 1794}
1742 1795
1743############################################################################# 1796#############################################################################
… …
1757 1810
1758 $class->SUPER::new ( 1811 $class->SUPER::new (
1759 padding => 2, 1812 padding => 2,
1760 fg => [1, 1, 1], 1813 fg => [1, 1, 1],
1761 active_fg => [1, 1, 0], 1814 active_fg => [1, 1, 0],
1815 bg => [0, 0, 0, 0.2],
1816 active_bg => [1, 1, 1, 0.5],
1762 state => 0, 1817 state => 0,
1763 can_hover => 1, 1818 can_hover => 1,
1764 @_ 1819 @_
1765 ) 1820 )
1766} 1821}
… …
1775 my ($self, $ev, $x, $y) = @_; 1830 my ($self, $ev, $x, $y) = @_;
1776 1831
1777 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1832 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1778 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1833 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1779 $self->{state} = !$self->{state}; 1834 $self->{state} = !$self->{state};
1780 $self->emit (changed => $self->{state}); 1835 $self->_emit (changed => $self->{state});
1781 } 1836 }
1782} 1837}
1783 1838
1784sub _draw { 1839sub _draw {
1785 my ($self) = @_; 1840 my ($self) = @_;
… …
1790 1845
1791 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1846 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1792 1847
1793 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1848 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1794 1849
1795 glEnable GL_BLEND; 1850 my $tex = $self->{state} ? $tex[1] : $tex[0];
1851
1796 glEnable GL_TEXTURE_2D; 1852 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); 1853 $tex->draw_quad_alpha (0, 0, $s, $s);
1802
1803 glDisable GL_TEXTURE_2D; 1854 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805} 1855}
1806 1856
1807############################################################################# 1857#############################################################################
1808 1858
1809package CFClient::UI::Image; 1859package CFClient::UI::Image;
… …
1852 glTranslate 0, -$self->{w}, 0; 1902 glTranslate 0, -$self->{w}, 0;
1853 1903
1854 ($w, $h) = ($h, $w); 1904 ($w, $h) = ($h, $w);
1855 } 1905 }
1856 1906
1857 glEnable GL_BLEND;
1858 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1859 glEnable GL_TEXTURE_2D; 1907 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1908 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 1909
1862 $tex->draw_quad (0, 0, $w, $h); 1910 $tex->draw_quad_alpha (0, 0, $w, $h);
1863 1911
1864 glDisable GL_BLEND;
1865 glDisable GL_TEXTURE_2D; 1912 glDisable GL_TEXTURE_2D;
1866} 1913}
1867 1914
1868############################################################################# 1915#############################################################################
1869 1916
… …
2058 qw(s1_slider.png s1_slider_bg.png); 2105 qw(s1_slider.png s1_slider_bg.png);
2059 2106
2060sub new { 2107sub new {
2061 my $class = shift; 2108 my $class = shift;
2062 2109
2063 # range [value, low, high, page] 2110 # range [value, low, high, page, unit]
2064 2111
2065 # TODO: 0-width page 2112 # TODO: 0-width page
2066 # TODO: req_w/h are wrong with vertical 2113 # TODO: req_w/h are wrong with vertical
2067 # TODO: calculations are off 2114 # TODO: calculations are off
2068 my $self = $class->SUPER::new ( 2115 my $self = $class->SUPER::new (
2069 fg => [1, 1, 1], 2116 fg => [1, 1, 1],
2070 active_fg => [0, 0, 0], 2117 active_fg => [0, 0, 0],
2118 bg => [0, 0, 0, 0.2],
2119 active_bg => [1, 1, 1, 0.5],
2071 range => [0, 0, 100, 10], 2120 range => [0, 0, 100, 10, 0],
2072 req_w => $::WIDTH / 80, 2121 req_w => $::WIDTH / 80,
2073 req_h => $::WIDTH / 80, 2122 req_h => $::WIDTH / 80,
2074 vertical => 0, 2123 vertical => 0,
2075 can_hover => 1, 2124 can_hover => 1,
2076 inner_pad => 5, 2125 inner_pad => 0.02,
2077 @_ 2126 @_
2078 ); 2127 );
2079 2128
2129 $self->set_value ($self->{range}[0]);
2130 $self->update;
2131
2080 $self 2132 $self
2133}
2134
2135sub set_range {
2136 my ($self, $range) = @_;
2137
2138 $self->{range} = $range;
2139
2140 $self->update;
2141}
2142
2143sub set_value {
2144 my ($self, $value) = @_;
2145
2146 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2147
2148 $hi = $lo + 1 if $hi <= $lo;
2149
2150 $page = $hi - $lo if $page > $hi - $lo;
2151
2152 $value = $lo if $value < $lo;
2153 $value = $hi - $page if $value > $hi - $page;
2154
2155 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2156 if $unit;
2157
2158 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2159
2160 if ($value != $old_value) {
2161 $self->_emit (changed => $value);
2162 $self->update;
2163 }
2081} 2164}
2082 2165
2083sub size_request { 2166sub size_request {
2084 my ($self) = @_; 2167 my ($self) = @_;
2085 2168
… …
2091 2174
2092sub button_down { 2175sub button_down {
2093 my ($self, $ev, $x, $y) = @_; 2176 my ($self, $ev, $x, $y) = @_;
2094 2177
2095 $self->SUPER::button_down ($ev, $x, $y); 2178 $self->SUPER::button_down ($ev, $x, $y);
2179
2180 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2181
2096 $self->mouse_motion ($ev, $x, $y); 2182 $self->mouse_motion ($ev, $x, $y);
2097} 2183}
2098 2184
2099sub mouse_motion { 2185sub mouse_motion {
2100 my ($self, $ev, $x, $y) = @_; 2186 my ($self, $ev, $x, $y) = @_;
2101 2187
2102 if ($GRAB == $self) { 2188 if ($GRAB == $self) {
2189 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2190
2191 my (undef, $lo, $hi, $page) = @{$self->{range}};
2192
2193 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2194
2195 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2196 }
2197}
2198
2199sub update {
2200 my ($self) = @_;
2201
2202 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2203 $self->set_value ($self->{range}[0]);
2204
2103 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2205 my ($value, $lo, $hi, $page) = @{$self->{range}};
2206 my $range = ($hi - $page - $lo) || 1e-100;
2104 2207
2105 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2208 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2106 2209
2107 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2210 $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 2211 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2109 2212
2110 $x -= $inner_pad_px; # substract the padding 2213 $value = ($value - $lo) / $range;
2111 $x = $x * ($hi - $lo) / $inner_w + $lo; 2214 $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 2215
2116 $self->emit (changed => $x); 2216 $self->{knob_x} = $value - $knob_w * 0.5;
2117 $self->update; 2217 $self->{knob_w} = $knob_w;
2118 } 2218 });
2119}
2120 2219
2121# the inner_* stuff is for generating a padding for the slider handle, 2220 $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} 2221}
2128 2222
2129sub _draw { 2223sub _draw {
2130 my ($self) = @_; 2224 my ($self) = @_;
2131 2225
2132 $self->SUPER::_draw (); 2226 $self->SUPER::_draw ();
2133 2227
2134 my ($w, $h) = @$self{qw(w h)}; 2228 glScale $self->{w}, $self->{h};
2135 2229
2136 if ($self->{vertical}) { 2230 if ($self->{vertical}) {
2137 # draw a vertical slider like a rotated horizontal slider 2231 # draw a vertical slider like a rotated horizontal slider
2138 2232
2233 glTranslate 1, 0, 0;
2139 glRotate 90, 0, 0, 1; 2234 glRotate 90, 0, 0, 1;
2140 glTranslate 0, -$self->{w}, 0;
2141
2142 ($w, $h) = ($h, $w);
2143 } 2235 }
2144 2236
2145 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2237 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2146 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2238 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2147 2239
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; 2240 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 2242
2171 # draw background 2243 # draw background
2172 $tex[1]->draw_quad (0, 0, $w, $h); 2244 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2173 2245
2174 # draw handle 2246 # draw handle
2175 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2247 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2176 2248
2177 glDisable GL_BLEND;
2178 glDisable GL_TEXTURE_2D; 2249 glDisable GL_TEXTURE_2D;
2179} 2250}
2251
2252#############################################################################
2253
2254package CFClient::UI::ValSlider;
2255
2256our @ISA = CFClient::UI::HBox::;
2257
2258sub new {
2259 my ($class, %arg) = @_;
2260
2261 my $range = delete $arg{range};
2262
2263 my $self = $class->SUPER::new (
2264 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2265 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2266 to_value => sub { shift },
2267 from_value => sub { shift },
2268 %arg,
2269 );
2270
2271 $self->{slider}->connect (changed => sub {
2272 my ($self, $value) = @_;
2273 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2274 $self->{parent}->emit (changed => $value);
2275 });
2276
2277# $self->{entry}->connect (changed => sub {
2278# my ($self, $value) = @_;
2279# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2280# $self->{parent}->emit (changed => $value);
2281# });
2282
2283 $self->add ($self->{slider}, $self->{entry});
2284
2285 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2286
2287 $self
2288}
2289
2290sub set_range { shift->{slider}->set_range (@_) }
2291sub set_value { shift->{slider}->set_value (@_) }
2180 2292
2181############################################################################# 2293#############################################################################
2182 2294
2183package CFClient::UI::TextView; 2295package CFClient::UI::TextView;
2184 2296
… …
2193 fontsize => 1, 2305 fontsize => 1,
2194 can_events => 0, 2306 can_events => 0,
2195 #font => default_font 2307 #font => default_font
2196 @_, 2308 @_,
2197 2309
2198 layout => (new CFClient::Layout), 2310 layout => (new CFClient::Layout 1),
2199 par => [], 2311 par => [],
2200 height => 0, 2312 height => 0,
2201 children => [ 2313 children => [
2202 (new CFClient::UI::Empty expand => 1), 2314 (new CFClient::UI::Empty expand => 1),
2203 (new CFClient::UI::Slider vertical => 1), 2315 (new CFClient::UI::Slider vertical => 1),
… …
2214 2326
2215 $self->{fontsize} = $fontsize; 2327 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2328 $self->reflow;
2217} 2329}
2218 2330
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 { 2331sub size_allocate {
2239 my ($self, $w, $h) = @_; 2332 my ($self, $w, $h) = @_;
2240 2333
2241 $self->SUPER::size_allocate ($w, $h); 2334 $self->SUPER::size_allocate ($w, $h);
2242 2335
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2338 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2339
2247 $self->reflow; 2340 $self->reflow;
2248} 2341}
2249 2342
2343sub text_size {
2344 my ($self, $text, $indent) = @_;
2345
2346 my $layout = $self->{layout};
2347
2348 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2349 $layout->set_width ($self->{children}[0]{w} - $indent);
2350 $layout->set_markup ($text);
2351
2352 $layout->size
2353}
2354
2355sub reflow {
2356 my ($self) = @_;
2357
2358 $self->{need_reflow}++;
2359 $self->update;
2360}
2361
2362sub set_offset {
2363 my ($self, $offset) = @_;
2364
2365 # todo: base offset on lines or so, not on pixels
2366 $self->{children}[1]->set_value ($offset);
2367}
2368
2369sub clear {
2370 my ($self) = @_;
2371
2372 $self->{par} = [];
2373 $self->{height} = 0;
2374 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2375}
2376
2250sub add_paragraph { 2377sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2378 my ($self, $color, $text, $indent) = @_;
2252 2379
2253 #TODO: intelligently "reformat" paragraph 2380 for my $line (split /\n/, $text) {
2254 2381 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2382 $self->{height} += $h;
2383 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2384 }
2258 2385
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2386 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262 $self->{children}[1]->update;
2263} 2387}
2264 2388
2265sub update { 2389sub update {
2266 my ($self) = @_; 2390 my ($self) = @_;
2267 2391
… …
2269 2393
2270 return unless $self->{h} > 0; 2394 return unless $self->{h} > 0;
2271 2395
2272 delete $self->{texture}; 2396 delete $self->{texture};
2273 2397
2274 $ROOT->on_refresh ($self, sub { 2398 $ROOT->on_post_alloc ($self, sub {
2399 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2400
2275 if (delete $self->{need_reflow}) { 2401 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2402 my $height = 0;
2277 2403
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2404 my $layout = $self->{layout};
2405
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407
2279 for @{$self->{par}}; 2408 for (@{$self->{par}}) {
2409 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2410 $layout->set_width ($W - $_->[3]);
2411 $layout->set_markup ($_->[4]);
2412 my ($w, $h) = $layout->size;
2413 $_->[0] = $w + $_->[3];
2414 $_->[1] = $h;
2415 }
2416
2417 $height += $_->[1];
2418 }
2280 2419
2281 $self->{height} = $height; 2420 $self->{height} = $height;
2282 2421
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2422 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2423
2285 delete $self->{texture}; 2424 delete $self->{texture};
2286 } 2425 }
2287 2426
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2427 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2428 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2429 glClear GL_COLOR_BUFFER_BIT;
2291 2430
2431 my $top = int $self->{children}[1]{range}[0];
2432
2433 my $y0 = $top;
2434 my $y1 = $top + $H;
2435
2436 my $y = 0;
2437
2438 my $layout = $self->{layout};
2439
2440 $layout->set_font ($self->{font}) if $self->{font};
2441
2292 glEnable GL_BLEND; 2442 glEnable GL_BLEND;
2443 #TODO# not correct in windows where rgba is forced off
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2444 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 2445
2308 for my $par (@{$self->{par}}) { 2446 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2447 my $h = $par->[1];
2310 2448
2311 if ($y0 < $y + $h && $y < $y1) { 2449 if ($y0 < $y + $h && $y < $y1) {
2450 $layout->set_foreground (@{ $par->[2] });
2451 $layout->set_width ($W - $par->[3]);
2312 $layout->set_text ($par->[2]); 2452 $layout->set_markup ($par->[4]);
2313 2453
2314 glColor @{ $par->[1] }; 2454 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2315 my ($W, $H) = $layout->size; 2455
2316 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2456 glRasterPos $par->[3], $y - $y0;
2457 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2317 } 2458 }
2318 2459
2319 $y += $h; 2460 $y += $h;
2320 } 2461 }
2321 2462
2322 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND; 2463 glDisable GL_BLEND;
2324 }; 2464 };
2325 }); 2465 });
2326} 2466}
2327 2467
2328sub _draw { 2468sub _draw {
2329 my ($self) = @_; 2469 my ($self) = @_;
2330 2470
2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2333 glEnable GL_TEXTURE_2D; 2471 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2473 glColor 1, 1, 1, 1;
2336 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2474 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2475 glDisable GL_TEXTURE_2D;
2338 glDisable GL_BLEND;
2339 2476
2340 $self->{children}[1]->draw; 2477 $self->{children}[1]->draw;
2341 2478
2342} 2479}
2343 2480
… …
2411 2548
2412 # TODO: use animation 2549 # TODO: use animation
2413 if ($self->{state} = !$self->{state}) { 2550 if ($self->{state} = !$self->{state}) {
2414 $CFClient::UI::ROOT->add ($self->{other}); 2551 $CFClient::UI::ROOT->add ($self->{other});
2415 $self->{other}->move ($self->coord2global (0, $self->{h})); 2552 $self->{other}->move ($self->coord2global (0, $self->{h}));
2416 $self->emit ("open"); 2553 $self->_emit ("open");
2417 } else { 2554 } else {
2418 $CFClient::UI::ROOT->remove ($self->{other}); 2555 $CFClient::UI::ROOT->remove ($self->{other});
2419 $self->emit ("close"); 2556 $self->_emit ("close");
2420 } 2557 }
2421 2558
2422 $self->emit (changed => $self->{state}); 2559 $self->_emit (changed => $self->{state});
2423} 2560}
2424 2561
2425############################################################################# 2562#############################################################################
2426 2563
2427package CFClient::UI::Tooltip; 2564package CFClient::UI::Tooltip;
… …
2437 @_, 2574 @_,
2438 can_events => 0, 2575 can_events => 0,
2439 ) 2576 )
2440} 2577}
2441 2578
2442sub set_markup { 2579sub set_tooltip_from {
2443 my ($self, $text) = @_; 2580 my ($self, $widget) = @_;
2444 2581
2445 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2582 $self->add (new CFClient::UI::Label
2446 $self->{label}->set_markup ($text); 2583 markup => $widget->{tooltip},
2447 $self->add ($self->{label}); 2584 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2585 fontsize => 0.8,
2586 fg => [0, 0, 0, 1],
2587 ellipsise => 0,
2588 font => ($widget->{tooltip_font} || $::FONT_PROP),
2589 );
2448} 2590}
2449 2591
2450sub size_request { 2592sub size_request {
2451 my ($self) = @_; 2593 my ($self) = @_;
2452
2453 $self->child->set_max_size ($::WIDTH * 0.3);
2454 2594
2455 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2595 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456 2596
2457 ($w + 4, $h + 4) 2597 ($w + 4, $h + 4)
2458} 2598}
… …
2464} 2604}
2465 2605
2466sub _draw { 2606sub _draw {
2467 my ($self) = @_; 2607 my ($self) = @_;
2468 2608
2469 glPushMatrix;
2470 glTranslate 0.375, 0.375; 2609 glTranslate 0.375, 0.375;
2471 2610
2472 my ($w, $h) = @$self{qw(w h)}; 2611 my ($w, $h) = @$self{qw(w h)};
2473 2612
2474 glColor 1, 0.8, 0.4; 2613 glColor 1, 0.8, 0.4;
… …
2485 glVertex 0 , $h; 2624 glVertex 0 , $h;
2486 glVertex $w, $h; 2625 glVertex $w, $h;
2487 glVertex $w, 0; 2626 glVertex $w, 0;
2488 glEnd; 2627 glEnd;
2489 2628
2490 glPopMatrix; 2629 glTranslate 2 - 0.375, 2 - 0.375;
2491
2492 glTranslate 2, 2;
2493 $self->SUPER::_draw; 2630 $self->SUPER::_draw;
2494} 2631}
2495 2632
2496############################################################################# 2633#############################################################################
2497 2634
… …
2502use CFClient::OpenGL; 2639use CFClient::OpenGL;
2503 2640
2504sub new { 2641sub new {
2505 my $class = shift; 2642 my $class = shift;
2506 2643
2507 $class->SUPER::new ( 2644 my $self = $class->SUPER::new (
2508 aspect => 1, 2645 aspect => 1,
2646 can_events => 0,
2509 @_, 2647 @_,
2510 ) 2648 );
2649
2650 if ($self->{anim} && $self->{animspeed}) {
2651 Scalar::Util::weaken (my $widget = $self);
2652
2653 $self->{timer} = Event->timer (
2654 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2655 hard => 1,
2656 interval => $self->{animspeed},
2657 cb => sub {
2658 ++$widget->{frame};
2659 $widget->update;
2660 },
2661 );
2662 }
2663
2664 $self
2511} 2665}
2512 2666
2513sub size_request { 2667sub size_request {
2514 (32, 8) 2668 (32, 8)
2515} 2669}
2516 2670
2671sub update {
2672 my ($self) = @_;
2673
2674 return unless $self->{visible};
2675
2676 $self->SUPER::update;
2677}
2678
2517sub _draw { 2679sub _draw {
2518 my ($self) = @_; 2680 my ($self) = @_;
2519 2681
2520 return unless $::CONN;#d# manage and cache textures differently 2682 return unless $::CONN;
2683
2684 my $face;
2685
2686 if ($self->{frame}) {
2687 my $anim = $::CONN->{anim}[$self->{anim}];
2688
2689 $face = $anim->[ $self->{frame} % @$anim ]
2690 if $anim && @$anim;
2691 }
2692
2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2693 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2522 2694
2523 # TODO animation
2524 if ($tex) { 2695 if ($tex) {
2525 glEnable GL_BLEND;
2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2527 glEnable GL_TEXTURE_2D; 2696 glEnable GL_TEXTURE_2D;
2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2529 glColor 1, 1, 1, 1; 2698 glColor 1, 1, 1, 1;
2530 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2699 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2531 glDisable GL_TEXTURE_2D; 2700 glDisable GL_TEXTURE_2D;
2532 glDisable GL_BLEND;
2533 } 2701 }
2702}
2703
2704sub DESTROY {
2705 my ($self) = @_;
2706
2707 $self->{timer}->cancel
2708 if $self->{timer};
2709
2710 $self->SUPER::DESTROY;
2534} 2711}
2535 2712
2536############################################################################# 2713#############################################################################
2537 2714
2538package CFClient::UI::InventoryItem; 2715package CFClient::UI::Inventory;
2539 2716
2540our @ISA = CFClient::UI::HBox::; 2717our @ISA = CFClient::UI::ScrolledWindow::;
2541 2718
2542sub new { 2719sub new {
2543 my $class = shift; 2720 my $class = shift;
2544 2721
2545 my %args = @_;
2546
2547 my $item = $args{item};
2548
2549 my $desc = $item->{nrof} < 2
2550 ? $item->{name}
2551 : "$item->{nrof} $item->{name_pl}";
2552
2553
2554 my $self = $class->SUPER::new ( 2722 my $self = $class->SUPER::new (
2555 can_hover => 1, 2723 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2556 can_events => 1,
2557 tooltip => (CFClient::UI::Label->escape ($desc)
2558 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2559 connect_button_down => sub {
2560 my ($self, $ev, $x, $y) = @_;
2561
2562 # todo: maybe put examine on 1? but should just be a tooltip :(
2563 if ($ev->{button} == 1) {
2564 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2565 } elsif ($ev->{button} == 2) {
2566 $::CONN->send ("apply $item->{tag}");
2567 } elsif ($ev->{button} == 3) {
2568 CFClient::UI::Menu->new (
2569 items => [
2570 ["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}") }],
2576 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2577 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2578 ],
2579 )->popup ($ev);
2580 }
2581
2582 1
2583 },
2584 %args
2585 );
2586 $self->add(new CFClient::UI::Face
2587 can_events => 0,
2588 face => $item->{face},
2589 anim => $item->{anim},
2590 animspeed => $item->{animspeed});
2591 $self->add(new CFClient::UI::Label
2592 can_events => 0,
2593 text => $desc);
2594
2595 $self
2596}
2597
2598#############################################################################
2599
2600package CFClient::UI::Inventory;
2601
2602our @ISA = CFClient::UI::ScrolledWindow::;
2603
2604sub new {
2605 my $class = shift;
2606
2607 my $self = $class->SUPER::new (
2608 scrolled => (new CFClient::UI::VBox),
2609 @_, 2724 @_,
2610 ); 2725 );
2611 2726
2612 $self 2727 $self
2613} 2728}
… …
2616 my ($self, $items) = @_; 2731 my ($self, $items) = @_;
2617 2732
2618 $self->{scrolled}->clear; 2733 $self->{scrolled}->clear;
2619 return unless $items; 2734 return unless $items;
2620 2735
2621 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2736 my @items = sort {
2737 ($a->{type} <=> $b->{type})
2738 or ($a->{name} cmp $b->{name})
2739 } @$items;
2622 2740
2623 $self->{real_items} = \@items; 2741 $self->{real_items} = \@items;
2624 2742
2743 my $row = 0;
2625 for my $item (@items) { 2744 for my $item (@items) {
2626 my $desc = $item->{nrof} < 2 2745 CFClient::Item::update_widgets $item;
2627 ? $item->{name}
2628 : "$item->{nrof} $item->{name_pl}";
2629 2746
2630 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2747 $self->{scrolled}->add (0, $row, $item->{face_widget});
2748 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2749 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2750
2751 $row++;
2631 } 2752 }
2632 2753
2633# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2634} 2755}
2635 2756
… …
2678 2799
2679# popup given the event (must be a mouse button down event currently) 2800# popup given the event (must be a mouse button down event currently)
2680sub popup { 2801sub popup {
2681 my ($self, $ev) = @_; 2802 my ($self, $ev) = @_;
2682 2803
2683 $self->emit ("popdown"); 2804 $self->_emit ("popdown");
2684 2805
2685 # maybe save $GRAB? must be careful about events... 2806 # maybe save $GRAB? must be careful about events...
2686 $GRAB = $self; 2807 $GRAB = $self;
2687 $self->{button} = $ev->{button}; 2808 $self->{button} = $ev->{button};
2688 2809
… …
2703 2824
2704 if ($ev->{button} == $self->{button}) { 2825 if ($ev->{button} == $self->{button}) {
2705 undef $GRAB; 2826 undef $GRAB;
2706 $self->hide; 2827 $self->hide;
2707 2828
2708 $self->emit ("popdown"); 2829 $self->_emit ("popdown");
2709 $self->{hover}[1]->() if $self->{hover}; 2830 $self->{hover}[1]->() if $self->{hover};
2710 } 2831 }
2711} 2832}
2712 2833
2713############################################################################# 2834#############################################################################
2714 2835
2836package CFClient::UI::Statusbox;
2837
2838our @ISA = CFClient::UI::VBox::;
2839
2840sub new {
2841 my $class = shift;
2842
2843 $class->SUPER::new (
2844 fontsize => 0.8,
2845 @_,
2846 )
2847}
2848
2849sub reorder {
2850 my ($self) = @_;
2851 my $NOW = time;
2852
2853 while (my ($k, $v) = each %{ $self->{item} }) {
2854 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2855 }
2856
2857 my @widgets;
2858
2859 my @items = sort {
2860 $a->{pri} <=> $b->{pri}
2861 or $b->{id} <=> $a->{id}
2862 } values %{ $self->{item} };
2863
2864 my $count = 10 + 1;
2865 for my $item (@items) {
2866 last unless --$count;
2867
2868 push @widgets, $item->{label} ||= do {
2869 # TODO: doesn't handle markup well (read as: at all)
2870 my $short = $item->{count} > 1
2871 ? "<b>$item->{count} ×</b> $item->{text}"
2872 : $item->{text};
2873
2874 for ($short) {
2875 s/^\s+//;
2876 s/\s+/ /g;
2877 }
2878
2879 new CFClient::UI::Label
2880 markup => $short,
2881 tooltip => $item->{tooltip},
2882 tooltip_font => $::FONT_PROP,
2883 tooltip_width => 0.67,
2884 fontsize => $item->{fontsize} || $self->{fontsize},
2885 max_w => $::WIDTH * 0.44,
2886 fg => $item->{fg},
2887 can_events => 1,
2888 can_hover => 1
2889 };
2890 }
2891
2892 $self->clear;
2893 $self->SUPER::add (reverse @widgets);
2894}
2895
2896sub add {
2897 my ($self, $text, %arg) = @_;
2898
2899 $text =~ s/^\s+//;
2900 $text =~ s/\s+$//;
2901
2902 return unless $text;
2903
2904 my $timeout = time + ((delete $arg{timeout}) || 60);
2905
2906 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2907
2908 if (my $item = $self->{item}{$group}) {
2909 if ($item->{text} eq $text) {
2910 $item->{count}++;
2911 } else {
2912 $item->{count} = 1;
2913 $item->{text} = $item->{tooltip} = $text;
2914 }
2915 $item->{id} = ++$self->{id};
2916 $item->{timeout} = $timeout;
2917 delete $item->{label};
2918 } else {
2919 $self->{item}{$group} = {
2920 id => ++$self->{id},
2921 text => $text,
2922 timeout => $timeout,
2923 tooltip => $text,
2924 fg => [0.8, 0.8, 0.8, 0.8],
2925 pri => 0,
2926 count => 1,
2927 %arg,
2928 };
2929 }
2930
2931 $self->reorder;
2932}
2933
2934sub reconfigure {
2935 my ($self) = @_;
2936
2937 delete $_->{label}
2938 for values %{ $self->{item} || {} };
2939
2940 $self->reorder;
2941 $self->SUPER::reconfigure;
2942}
2943
2944#############################################################################
2945
2715package CFClient::UI::Root; 2946package CFClient::UI::Root;
2716 2947
2717our @ISA = CFClient::UI::Container::; 2948our @ISA = CFClient::UI::Container::;
2718 2949
2719use CFClient::OpenGL; 2950use CFClient::OpenGL;
2720 2951
2952sub new {
2953 my $class = shift;
2954
2955 $class->SUPER::new (
2956 @_,
2957 )
2958}
2959
2960sub configure {
2961 my ($self, $x, $y, $w, $h) = @_;
2962
2963 $self->{w} = $w;
2964 $self->{h} = $h;
2965}
2966
2721sub check_size { 2967sub check_size {
2722 my ($self) = @_; 2968 my ($self) = @_;
2723 2969
2724 $self->configure (0, 0, $self->{w}, $self->{h}); 2970 $self->size_allocate ($self->{w}, $self->{h})
2971 if $self->{w};
2725} 2972}
2726 2973
2727sub size_request { 2974sub size_request {
2728 my ($self) = @_; 2975 my ($self) = @_;
2729 2976
… …
2731} 2978}
2732 2979
2733sub size_allocate { 2980sub size_allocate {
2734 my ($self, $w, $h) = @_; 2981 my ($self, $w, $h) = @_;
2735 2982
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) { 2983 for my $child ($self->children) {
2762 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2984 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2763 2985
2986 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2987 if exists $child->{req_x};
2988
2989 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2990 if exists $child->{req_y};
2991
2764 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2992 $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; 2993 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2994
2766 $child->configure ($X, $Y, $W, $H); 2995 $child->configure ($X, $Y, $W, $H);
2767 } 2996 }
2768} 2997}
2769 2998
2770sub _topleft { 2999sub coord2local {
2771 my ($self, $x, $y) = @_; 3000 my ($self, $x, $y) = @_;
2772 3001
2773 ($x, $y) 3002 ($x, $y)
2774} 3003}
2775 3004
3005sub coord2global {
3006 my ($self, $x, $y) = @_;
3007
3008 ($x, $y)
3009}
3010
2776sub update { 3011sub update {
2777 my ($self) = @_; 3012 my ($self) = @_;
2778 3013
2779 $self->check_size; 3014 $self->check_size;
2780 ::refresh (); 3015 $::WANT_REFRESH++;
2781} 3016}
2782 3017
2783sub add { 3018sub add {
2784 my ($self, $child) = @_; 3019 my ($self, @children) = @_;
2785 3020
3021 for (my @widgets = @children; my $w = pop @widgets; ) {
3022 push @widgets, $w->children;
3023 $w->{root} = $self;
3024 $w->{visible} = 1;
3025 }
3026
3027 for my $child (@children) {
3028 $child->{is_toplevel} = 1;
3029
2786 # integerize window positions 3030 # integerise window positions
2787 $child->{x} = int $child->{x}; 3031 $child->{x} = int $child->{x};
2788 $child->{y} = int $child->{y}; 3032 $child->{y} = int $child->{y};
3033 }
2789 3034
2790 $self->SUPER::add ($child); 3035 $self->SUPER::add (@children);
3036}
3037
3038sub remove {
3039 my ($self, @children) = @_;
3040
3041 $self->SUPER::remove (@children);
3042
3043 while (@children) {
3044 my $w = pop @children;
3045 push @children, $w->children;
3046 $w->set_invisible;
3047 }
2791} 3048}
2792 3049
2793sub on_refresh { 3050sub on_refresh {
2794 my ($self, $id, $cb) = @_; 3051 my ($self, $id, $cb) = @_;
2795 3052
2796 $self->{refresh_hook}{$id} = $cb; 3053 $self->{refresh_hook}{$id} = $cb;
2797} 3054}
2798 3055
3056sub on_post_alloc {
3057 my ($self, $id, $cb) = @_;
3058
3059 $self->{post_alloc_hook}{$id} = $cb;
3060}
3061
2799sub draw { 3062sub draw {
2800 my ($self) = @_; 3063 my ($self) = @_;
2801 3064
2802 while (my $rcb = delete $self->{refresh_hook}) { 3065 while ($self->{refresh_hook}) {
2803 $_->() for values %$rcb; 3066 $_->()
3067 for values %{delete $self->{refresh_hook}};
3068 }
3069
3070 if ($self->{check_size}) {
3071 my @queue = ([], []);
3072
3073 for (;;) {
3074 if ($self->{check_size}) {
3075 # heuristic: check containers last
3076 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3077 for values %{delete $self->{check_size}}
3078 }
3079
3080 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3081
3082 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3083 ? @$widget{qw(user_w user_h)}
3084 : $widget->size_request;
3085
3086 if (delete $widget->{force_alloc}
3087 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3088 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3089
3090 $widget->{req_w} = $w;
3091 $widget->{req_h} = $h;
3092
3093 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3094
3095 $widget->{parent}->check_size
3096 if $widget->{parent};
3097 }
3098 }
3099 }
3100
3101 while ($self->{size_alloc}) {
3102 for (values %{delete $self->{size_alloc}}) {
3103 my ($widget, $w, $h) = @$_;
3104
3105 $w = 0 if $w < 0;
3106 $h = 0 if $h < 0;
3107
3108 $widget->{w} = $w;
3109 $widget->{h} = $h;
3110 $widget->emit (size_allocate => $w, $h);
3111 }
3112 }
3113
3114 while ($self->{post_alloc_hook}) {
3115 $_->()
3116 for values %{delete $self->{post_alloc_hook}};
2804 } 3117 }
2805 3118
2806 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3119 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2807 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3120 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2808 glClear GL_COLOR_BUFFER_BIT; 3121 glClear GL_COLOR_BUFFER_BIT;
2809 3122
2810 glMatrixMode GL_PROJECTION; 3123 glMatrixMode GL_PROJECTION;
2811 glLoadIdentity; 3124 glLoadIdentity;
2812 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3125 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2813 glMatrixMode GL_MODELVIEW; 3126 glMatrixMode GL_MODELVIEW;
2814 glLoadIdentity; 3127 glLoadIdentity;
2815 3128
2816 $self->_draw; 3129 $self->_draw;
2817} 3130}
… …
2819############################################################################# 3132#############################################################################
2820 3133
2821package CFClient::UI; 3134package CFClient::UI;
2822 3135
2823$ROOT = new CFClient::UI::Root; 3136$ROOT = new CFClient::UI::Root;
2824$TOOLTIP = new CFClient::UI::Tooltip; 3137$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2825 3138
28261 31391
2827 3140

Diff Legend

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