ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.186 by root, Mon May 8 20:39:34 2006 UTC vs.
Revision 1.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->{parent} 473 $self->{force_alloc} = 1 if $forced;
409 or return 1; 474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429} 475}
430 476
431sub update { 477sub update {
432 my ($self) = @_; 478 my ($self) = @_;
433 479
… …
439 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
440 486
441 push @{ $self->{signal_cb}{$signal} }, $cb; 487 push @{ $self->{signal_cb}{$signal} }, $cb;
442} 488}
443 489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
444sub emit { 496sub emit {
445 my ($self, $signal, @args) = @_; 497 my ($self, $signal, @args) = @_;
446 498
447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
448} 501}
449 502
450sub DESTROY { 503sub DESTROY {
451 my ($self) = @_; 504 my ($self) = @_;
452 505
506 delete $WIDGET{$self+0};
453 #$self->deactivate; 507 #$self->deactivate;
454} 508}
455 509
456############################################################################# 510#############################################################################
457 511
… …
466 my $class = shift; 520 my $class = shift;
467 521
468 # range [value, low, high, page] 522 # range [value, low, high, page]
469 523
470 $class->SUPER::new ( 524 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 525 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 526 #active_bg => [1, 1, 1, 0.5],
473 @_ 527 @_
474 ) 528 )
475} 529}
476 530
477sub _draw { 531sub _draw {
478 my ($self) = @_; 532 my ($self) = @_;
479 533
534 my $color = $FOCUS == $self && $self->{active_bg}
535 ? $self->{active_bg}
536 : $self->{bg};
537
538 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 539 my ($w, $h) = @$self{qw(w h)};
481 540
482 glEnable GL_BLEND; 541 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 543 glColor @$color;
485 544
486 glBegin GL_QUADS; 545 glBegin GL_QUADS;
487 glVertex 0 , 0; 546 glVertex 0 , 0;
488 glVertex 0 , $h; 547 glVertex 0 , $h;
489 glVertex $w, $h; 548 glVertex $w, $h;
490 glVertex $w, 0; 549 glVertex $w, 0;
491 glEnd; 550 glEnd;
492 551
493 glDisable GL_BLEND; 552 glDisable GL_BLEND;
553 }
494} 554}
495 555
496############################################################################# 556#############################################################################
497 557
498package CFClient::UI::Empty; 558package CFClient::UI::Empty;
… …
530 590
531 $self 591 $self
532} 592}
533 593
534sub add { 594sub add {
535 my ($self, $child) = @_; 595 my ($self, @widgets) = @_;
536 596
537 $child->set_parent ($self); 597 $_->set_parent ($self)
598 for @widgets;
538 599
539 use sort 'stable'; 600 use sort 'stable';
540 601
541 $self->{children} = [ 602 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 603 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 604 @{$self->{children}}, @widgets
544 ]; 605 ];
545 606
546 $child->check_size; 607 $self->check_size (1);
547 $self->update; 608 $self->update;
548} 609}
549 610
550sub children { 611sub children {
551 @{ $_[0]{children} } 612 @{ $_[0]{children} }
… …
557 delete $child->{parent}; 618 delete $child->{parent};
558 $child->hide; 619 $child->hide;
559 620
560 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
561 622
562 $self->check_size; 623 $self->check_size (1);
563 $self->update; 624 $self->update;
564} 625}
565 626
566sub clear { 627sub clear {
567 my ($self) = @_; 628 my ($self) = @_;
… …
658} 719}
659 720
660sub update { 721sub update {
661 my ($self) = @_; 722 my ($self) = @_;
662 723
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 724 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 725 $self->SUPER::update;
665} 726}
666 727
667sub size_allocate { 728sub size_allocate {
668 my ($self, $w, $h) = @_; 729 my ($self, $w, $h) = @_;
… …
681 $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 {
682 glClearColor 0, 0, 0, 0; 743 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT; 744 glClear GL_COLOR_BUFFER_BIT;
684 745
685 $self->_render; 746 $self->_render;
686# glColorMask 1, 1, 1, 0;
687# glEnable GL_BLEND;
688# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689# glRasterPos 0, 0;
690# glCopyPixels 0, 0, $self->{w}, $self->{h};
691# glDisable GL_BLEND;
692# glColorMask 1, 1, 1, 1;
693 }; 747 };
694} 748}
695 749
696sub _draw { 750sub _draw {
697 my ($self) = @_; 751 my ($self) = @_;
… …
699 my ($w, $h) = ($self->w, $self->h); 753 my ($w, $h) = ($self->w, $self->h);
700 754
701 my $tex = $self->{texture} 755 my $tex = $self->{texture}
702 or return; 756 or return;
703 757
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 758 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 760 glColor 1, 1, 1, 1;
709 761
710 $tex->draw_quad (0, 0, $w, $h); 762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 763
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 764 glDisable GL_TEXTURE_2D;
714} 765}
715 766
716############################################################################# 767#############################################################################
717 768
718package CFClient::UI::ViewPort; 769package CFClient::UI::ViewPort;
719 770
720our @ISA = CFClient::UI::Window::; 771our @ISA = CFClient::UI::Window::;
721 772
773sub new {
774 my $class = shift;
775
776 $class->SUPER::new (
777 scroll_x => 0,
778 scroll_y => 1,
779 @_,
780 )
781}
782
722sub size_request { 783sub size_request {
723 my ($self) = @_; 784 my ($self) = @_;
724 785
725 @$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)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 787
728 @$self{qw(child_w child_h)} 788 @$self{qw(child_w child_h)}
729} 789}
730 790
731sub size_allocate { 791sub size_allocate {
732 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 798 $self->update;
735} 799}
736 800
737sub set_offset { 801sub set_offset {
738 my ($self, $x, $y) = @_; 802 my ($self, $x, $y) = @_;
… …
741 $self->{view_y} = int $y; 805 $self->{view_y} = int $y;
742 806
743 $self->update; 807 $self->update;
744} 808}
745 809
746# 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
747sub _topleft { 811sub coord2local {
748 my ($self, $x, $y) = @_; 812 my ($self, $x, $y) = @_;
749 813
750 $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)
751} 824}
752 825
753sub find_widget { 826sub find_widget {
754 my ($self, $x, $y) = @_; 827 my ($self, $x, $y) = @_;
755 828
… …
783 856
784 my $slider = new CFClient::UI::Slider 857 my $slider = new CFClient::UI::Slider
785 vertical => 1, 858 vertical => 1,
786 range => [0, 0, 1, 0.01], # HACK fix 859 range => [0, 0, 1, 0.01], # HACK fix
787 connect_changed => sub { 860 connect_changed => sub {
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 861 $self->{vp}->set_offset (0, $_[1]);
789 }, 862 },
790 ; 863 ;
791 864
792 $self = $class->SUPER::new ( 865 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort), 866 vp => (new CFClient::UI::ViewPort expand => 1),
794 slider => $slider, 867 slider => $slider,
795 @_, 868 @_,
796 ); 869 );
797 870
798 $self->{vp}->add ($self->{scrolled}); 871 $self->{vp}->add ($self->{scrolled});
… …
800 $self->add ($self->{slider}); 873 $self->add ($self->{slider});
801 874
802 $self 875 $self
803} 876}
804 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
805#TODO# update range on size_allocate depeneing on child 887#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 888# update viewport offset on scroll
807 889
808############################################################################# 890#############################################################################
809 891
810package CFClient::UI::Frame; 892package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 896use CFClient::OpenGL;
815 897
816sub new { 898sub new {
817 my $class = shift; 899 my $class = shift;
818 900
819 my $self = $class->SUPER::new ( 901 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 902 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 903 @_,
824 ); 904 )
825
826 $self
827} 905}
828 906
829sub _draw { 907sub _draw {
830 my ($self) = @_; 908 my ($self) = @_;
831 909
832 my ($w, $h) = ($self->{w}, $self->{h}); 910 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)};
833 912
834 glEnable GL_BLEND; 913 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 915 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 916
839# glBegin GL_QUADS; 917 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 918 glVertex 0 , 0;
842# glVertex 0 , $h; 919 glVertex 0 , $h;
843# glVertex $w, $h; 920 glVertex $w, $h;
844# glVertex $w, 0; 921 glVertex $w, 0;
845# glEnd; 922 glEnd;
846 923
847
848 $self->child->draw;
849 glDisable GL_BLEND; 924 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 925 }
926
927 $self->SUPER::_draw;
851} 928}
852 929
853############################################################################# 930#############################################################################
854 931
855package CFClient::UI::FancyFrame; 932package CFClient::UI::FancyFrame;
… …
866 my $class = shift; 943 my $class = shift;
867 944
868 # TODO: user_x, user_y, overwrite moveto? 945 # TODO: user_x, user_y, overwrite moveto?
869 946
870 my $self = $class->SUPER::new ( 947 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 948 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 949 border_bg => [1, 1, 1, 1],
873 border => 0.6, 950 border => 0.6,
951 is_toplevel => 1,
874 can_events => 1, 952 can_events => 1,
875 @_ 953 @_
876 ); 954 );
877 955
878 $self->{title} &&= new CFClient::UI::Label 956 $self->{title} &&= new CFClient::UI::Label
879 align => 0, 957 align => 0,
… …
903 my ($self, $w, $h) = @_; 981 my ($self, $w, $h) = @_;
904 982
905 $h -= List::Util::max 0, $self->border * 2; 983 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 984 $w -= List::Util::max 0, $self->border * 2;
907 985
908 $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)
909 if $self->{title}; 987 if $self->{title};
910 988
911 $self->child->configure ($self->border, $self->border, $w, $h); 989 $self->child->configure ($self->border, $self->border, $w, $h);
912} 990}
913 991
… …
971 my ($self) = @_; 1049 my ($self) = @_;
972 1050
973 my ($w, $h ) = ($self->{w}, $self->{h}); 1051 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 1053
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 1054 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 1056
981 my $border = $self->border; 1057 my $border = $self->border;
982 1058
983 glColor @{ $self->{border_bg} }; 1059 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988 1064
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 1066 my $bg = $tex[0];
991 1067
992 # TODO: repeat texture not scale 1068 # TODO: repeat texture not scale
… …
996 glColor @{ $self->{bg} }; 1072 glColor @{ $self->{bg} };
997 1073
998 $bg->{s} = $rep_x; 1074 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y; 1075 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1; 1076 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 }
1002 1079
1003 glDisable GL_TEXTURE_2D; 1080 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1081
1007 $self->{title}->draw if $self->{title}; 1082 $self->{title}->draw if $self->{title};
1008 1083
1009 $self->child->draw; 1084 $self->child->draw;
1010} 1085}
… …
1022sub new { 1097sub new {
1023 my $class = shift; 1098 my $class = shift;
1024 1099
1025 $class->SUPER::new ( 1100 $class->SUPER::new (
1026 col_expand => [], 1101 col_expand => [],
1027 @_ 1102 @_,
1028 ) 1103 )
1104}
1105
1106sub children {
1107 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1029} 1108}
1030 1109
1031sub add { 1110sub add {
1032 my ($self, $x, $y, $child) = @_; 1111 my ($self, $x, $y, $child) = @_;
1033 1112
1034 $child->set_parent ($self); 1113 $child->set_parent ($self);
1035 $self->{children}[$y][$x] = $child; 1114 $self->{children}[$y][$x] = $child;
1036 1115
1037 $child->check_size; 1116 $self->check_size (1);
1038} 1117}
1039 1118
1040sub children {
1041 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1042}
1043
1044# 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?
1045sub clear { 1120sub clear {
1046 my ($self) = @_; 1121 my ($self) = @_;
1047 1122
1048 my @children = $self->children; 1123 my @children = $self->children;
1049 delete $self->{children}; 1124 delete $self->{children};
… …
1051 for (@children) { 1126 for (@children) {
1052 delete $_->{parent}; 1127 delete $_->{parent};
1053 $_->hide; 1128 $_->hide;
1054 } 1129 }
1055 1130
1131 $self->check_size (1);
1056 $self->update; 1132 $self->update;
1057} 1133}
1058 1134
1059sub get_wh { 1135sub get_wh {
1060 my ($self) = @_; 1136 my ($self) = @_;
… …
1237} 1313}
1238 1314
1239sub size_allocate { 1315sub size_allocate {
1240 my ($self, $w, $h) = @_; 1316 my ($self, $w, $h) = @_;
1241 1317
1318 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1319
1242 my $children = $self->{children}; 1320 my $children = $self->{children};
1243 1321
1244 my @h = map $_->{req_h}, @$children; 1322 my @h = map $_->{req_h}, @$children;
1245 1323
1246 my $req_h = List::Util::sum @h; 1324 my $req_h = List::Util::sum @h;
… …
1275 1353
1276############################################################################# 1354#############################################################################
1277 1355
1278package CFClient::UI::Label; 1356package CFClient::UI::Label;
1279 1357
1280our @ISA = CFClient::UI::Base::; 1358our @ISA = CFClient::UI::DrawBG::;
1281 1359
1282use CFClient::OpenGL; 1360use CFClient::OpenGL;
1283 1361
1284sub new { 1362sub new {
1285 my ($class, %arg) = @_; 1363 my ($class, %arg) = @_;
1286 1364
1287 my $self = $class->SUPER::new ( 1365 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1366 fg => [1, 1, 1],
1367 #bg => none
1368 #active_bg => none
1289 #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),
1290 fontsize => 1, 1375 fontsize => 1,
1291 text => "",
1292 align => -1, 1376 align => -1,
1293 valign => -1, 1377 valign => -1,
1294 padding => 2, 1378 padding => 2,
1295 layout => new CFClient::Layout,
1296 can_events => 0, 1379 can_events => 0,
1297 %arg 1380 %arg
1298 ); 1381 );
1299 1382
1300 if (exists $self->{template}) { 1383 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1384 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1385 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1386 $self->{template} = $layout;
1304 } 1387 }
1305 1388
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1389 if (exists $self->{markup}) {
1307 $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 }
1308 1394
1309 $self 1395 $self
1310} 1396}
1311 1397
1312sub escape { 1398sub escape($) {
1313 local $_ = $_[1]; 1399 local $_ = $_[0];
1314 1400
1315 s/&/&amp;/g; 1401 s/&/&amp;/g;
1316 s/>/&gt;/g; 1402 s/>/&gt;/g;
1317 s/</&lt;/g; 1403 s/</&lt;/g;
1318 1404
1319 $_[1] 1405 $_
1320} 1406}
1321 1407
1322sub update { 1408sub update {
1323 my ($self) = @_; 1409 my ($self) = @_;
1324 1410
… …
1330 my ($self, $text) = @_; 1416 my ($self, $text) = @_;
1331 1417
1332 return if $self->{text} eq "T$text"; 1418 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1419 $self->{text} = "T$text";
1334 1420
1421 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1422 $self->{layout}->set_text ($text);
1336 1423
1337 delete $self->{texture};
1338 $self->update; 1424 $self->update;
1339 $self->check_size; 1425 $self->check_size;
1340} 1426}
1341 1427
1342sub set_markup { 1428sub set_markup {
1343 my ($self, $markup) = @_; 1429 my ($self, $markup) = @_;
1344 1430
1345 return if $self->{text} eq "M$markup"; 1431 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1432 $self->{text} = "M$markup";
1347 1433
1434 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1435
1436 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1437 $self->{layout}->set_markup ($markup);
1349 1438
1350 delete $self->{texture};
1351 $self->update; 1439 $self->update;
1352 $self->check_size; 1440 $self->check_size;
1353} 1441}
1354 1442
1355sub size_request { 1443sub size_request {
1356 my ($self) = @_; 1444 my ($self) = @_;
1357 1445
1358 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1446 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $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});
1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1450 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361 1451
1362 my ($w, $h) = $self->{layout}->size; 1452 my ($w, $h) = $self->{layout}->size;
1363 1453
1364 if (exists $self->{template}) { 1454 if (exists $self->{template}) {
… …
1394} 1484}
1395 1485
1396sub _draw { 1486sub _draw {
1397 my ($self) = @_; 1487 my ($self) = @_;
1398 1488
1489 $self->SUPER::_draw; # draw background, if applicable
1490
1399 my $tex = $self->{texture} ||= do { 1491 my $tex = $self->{texture} ||= do {
1492 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1493 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $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});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498
1403 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
1404 }; 1510 };
1405 1511
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1512 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1514
1515 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1516 glColor @{$self->{fg}};
1412
1413 $self->{ox} = int (
1414 $self->{align} < 0 ? $self->{padding}
1415 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416 : ($self->{w} - $tex->{w}) * 0.5
1417 );
1418
1419 $self->{oy} = int (
1420 $self->{valign} < 0 ? $self->{padding}
1421 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422 : ($self->{h} - $tex->{h}) * 0.5
1423 );
1424
1425 $tex->draw_quad ($self->{ox}, $self->{oy}); 1517 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1518 } else {
1519 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1520 }
1426 1521
1427 glDisable GL_TEXTURE_2D; 1522 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1523}
1430 1524
1431############################################################################# 1525#############################################################################
1432 1526
1433package CFClient::UI::EntryBase; 1527package CFClient::UI::EntryBase;
… …
1446 active_fg => [0, 0, 0], 1540 active_fg => [0, 0, 0],
1447 can_hover => 1, 1541 can_hover => 1,
1448 can_focus => 1, 1542 can_focus => 1,
1449 valign => 0, 1543 valign => 0,
1450 can_events => 1, 1544 can_events => 1,
1545 #text => ...
1451 @_ 1546 @_
1452 ) 1547 )
1453} 1548}
1454 1549
1455sub _set_text { 1550sub _set_text {
… …
1465 $self->{text} = $text; 1560 $self->{text} = $text;
1466 1561
1467 $text =~ s/./*/g if $self->{hidden}; 1562 $text =~ s/./*/g if $self->{hidden};
1468 $self->{layout}->set_text ("$text "); 1563 $self->{layout}->set_text ("$text ");
1469 1564
1470 $self->emit (changed => $self->{text}); 1565 $self->_emit (changed => $self->{text});
1471}
1472
1473sub get_text {
1474 $_[0]{text}
1475}
1476
1477sub size_request {
1478 my ($self) = @_;
1479
1480 my ($w, $h) = $self->SUPER::size_request;
1481
1482 ($w + 1, $h) # add 1 for cursor
1483}
1484
1485sub size_allocate {
1486 my ($self, $w, $h) = @_;
1487
1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489} 1566}
1490 1567
1491sub set_text { 1568sub set_text {
1492 my ($self, $text) = @_; 1569 my ($self, $text) = @_;
1493 1570
1494 $self->{cursor} = length $text; 1571 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1572 $self->_set_text ($text);
1496 $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
1497} 1587}
1498 1588
1499sub key_down { 1589sub key_down {
1500 my ($self, $ev) = @_; 1590 my ($self, $ev) = @_;
1501 1591
… …
1503 my $sym = $ev->{sym}; 1593 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1594 my $uni = $ev->{unicode};
1505 1595
1506 my $text = $self->get_text; 1596 my $text = $self->get_text;
1507 1597
1508 if ($sym == 8) { 1598 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1599 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1600 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1601 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1602 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1603 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1604 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1605 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1606 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1607 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1608 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1609 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1610 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1611 $self->_emit ('escape');
1522 } elsif ($uni) { 1612 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1613 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1614 }
1525 1615
1526 $self->_set_text ($text); 1616 $self->_set_text ($text);
1527 $self->update; 1617 $self->update;
1618 $self->check_size;
1528} 1619}
1529 1620
1530sub focus_in { 1621sub focus_in {
1531 my ($self) = @_; 1622 my ($self) = @_;
1532 1623
… …
1612 if ($sym == 13) { 1703 if ($sym == 13) {
1613 unshift @{$self->{history}}, 1704 unshift @{$self->{history}},
1614 my $txt = $self->get_text; 1705 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1; 1706 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = ''; 1707 $self->{history_saveback} = '';
1617 $self->emit (activate => $txt); 1708 $self->_emit (activate => $txt);
1618 $self->update; 1709 $self->update;
1619 1710
1620 } elsif ($sym == CFClient::SDLK_UP) { 1711 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) { 1712 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text; 1713 $self->{history_saveback} = $self->get_text;
… …
1661 my $class = shift; 1752 my $class = shift;
1662 1753
1663 $class->SUPER::new ( 1754 $class->SUPER::new (
1664 padding => 4, 1755 padding => 4,
1665 fg => [1, 1, 1], 1756 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1757 active_fg => [0, 0, 1],
1668 can_hover => 1, 1758 can_hover => 1,
1669 align => 0, 1759 align => 0,
1670 valign => 0, 1760 valign => 0,
1671 can_events => 1, 1761 can_events => 1,
1672 @_ 1762 @_
1673 ) 1763 )
1674} 1764}
1675 1765
1766sub activate { }
1767
1676sub button_up { 1768sub button_up {
1677 my ($self, $ev, $x, $y) = @_; 1769 my ($self, $ev, $x, $y) = @_;
1678 1770
1771 $self->emit ("activate")
1679 if ($x >= 0 && $x < $self->{w} 1772 if $x >= 0 && $x < $self->{w}
1680 && $y >= 0 && $y < $self->{h}) { 1773 && $y >= 0 && $y < $self->{h};
1681 $self->emit ("activate");
1682 }
1683} 1774}
1684 1775
1685sub _draw { 1776sub _draw {
1686 my ($self) = @_; 1777 my ($self) = @_;
1687 1778
… …
1689 1780
1690 if ($GRAB == $self) { 1781 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1782 $self->{fg} = $self->{active_fg};
1692 } 1783 }
1693 1784
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1785 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1786 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1787 glColor 0, 0, 0, 1;
1699 1788
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1789 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1790
1702 glDisable GL_TEXTURE_2D; 1791 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1792
1705 $self->SUPER::_draw; 1793 $self->SUPER::_draw;
1706} 1794}
1707 1795
1708############################################################################# 1796#############################################################################
… …
1722 1810
1723 $class->SUPER::new ( 1811 $class->SUPER::new (
1724 padding => 2, 1812 padding => 2,
1725 fg => [1, 1, 1], 1813 fg => [1, 1, 1],
1726 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],
1727 state => 0, 1817 state => 0,
1728 can_hover => 1, 1818 can_hover => 1,
1729 @_ 1819 @_
1730 ) 1820 )
1731} 1821}
… …
1740 my ($self, $ev, $x, $y) = @_; 1830 my ($self, $ev, $x, $y) = @_;
1741 1831
1742 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1832 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1743 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1833 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1744 $self->{state} = !$self->{state}; 1834 $self->{state} = !$self->{state};
1745 $self->emit (changed => $self->{state}); 1835 $self->_emit (changed => $self->{state});
1746 } 1836 }
1747} 1837}
1748 1838
1749sub _draw { 1839sub _draw {
1750 my ($self) = @_; 1840 my ($self) = @_;
… …
1755 1845
1756 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;
1757 1847
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1848 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1849
1760 glEnable GL_BLEND; 1850 my $tex = $self->{state} ? $tex[1] : $tex[0];
1851
1761 glEnable GL_TEXTURE_2D; 1852 glEnable GL_TEXTURE_2D;
1762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764 my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766 $tex->draw_quad (0, 0, $s, $s); 1853 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1854 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1855}
1771 1856
1772############################################################################# 1857#############################################################################
1773 1858
1774package CFClient::UI::Image; 1859package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1902 glTranslate 0, -$self->{w}, 0;
1818 1903
1819 ($w, $h) = ($h, $w); 1904 ($w, $h) = ($h, $w);
1820 } 1905 }
1821 1906
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1907 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1908 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1909
1827 $tex->draw_quad (0, 0, $w, $h); 1910 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1911
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1912 glDisable GL_TEXTURE_2D;
1831} 1913}
1832 1914
1833############################################################################# 1915#############################################################################
1834 1916
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2105 qw(s1_slider.png s1_slider_bg.png);
2024 2106
2025sub new { 2107sub new {
2026 my $class = shift; 2108 my $class = shift;
2027 2109
2028 # range [value, low, high, page] 2110 # range [value, low, high, page, unit]
2029 2111
2030 # TODO: 0-width page 2112 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2113 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2114 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2115 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2116 fg => [1, 1, 1],
2035 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],
2036 range => [0, 0, 100, 10], 2120 range => [0, 0, 100, 10, 0],
2037 req_w => $::WIDTH / 80, 2121 req_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2122 req_h => $::WIDTH / 80,
2039 vertical => 0, 2123 vertical => 0,
2040 can_hover => 1, 2124 can_hover => 1,
2041 inner_pad => 5, 2125 inner_pad => 0.02,
2042 @_ 2126 @_
2043 ); 2127 );
2044 2128
2129 $self->set_value ($self->{range}[0]);
2130 $self->update;
2131
2045 $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 }
2046} 2164}
2047 2165
2048sub size_request { 2166sub size_request {
2049 my ($self) = @_; 2167 my ($self) = @_;
2050 2168
… …
2056 2174
2057sub button_down { 2175sub button_down {
2058 my ($self, $ev, $x, $y) = @_; 2176 my ($self, $ev, $x, $y) = @_;
2059 2177
2060 $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
2061 $self->mouse_motion ($ev, $x, $y); 2182 $self->mouse_motion ($ev, $x, $y);
2062} 2183}
2063 2184
2064sub mouse_motion { 2185sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2186 my ($self, $ev, $x, $y) = @_;
2066 2187
2067 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
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2205 my ($value, $lo, $hi, $page) = @{$self->{range}};
2206 my $range = ($hi - $page - $lo) || 1e-100;
2069 2207
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2208 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2071 2209
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2210 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2073 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2211 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2074 2212
2075 $x -= $inner_pad_px; # substract the padding 2213 $value = ($value - $lo) / $range;
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2214 $value = $value * $self->{scale} + $self->{offset};
2077 $x = $lo if $x < $lo;
2078 $x = $hi - $page if $x > $hi - $page;
2079 $self->{range}[0] = $x;
2080 2215
2081 $self->emit (changed => $x); 2216 $self->{knob_x} = $value - $knob_w * 0.5;
2082 $self->update; 2217 $self->{knob_w} = $knob_w;
2083 } 2218 });
2084}
2085 2219
2086# the inner_* stuff is for generating a padding for the slider handle, 2220 $self->SUPER::update;
2087# so that the handle doesn't leave the texture. This calculation isn't 100%
2088# correct propably, but it does the job for now
2089sub _calc_inner_pad_px {
2090 my ($self, $w) = @_;
2091 ($w / 100) * $self->{inner_pad} # % to pixels
2092} 2221}
2093 2222
2094sub _draw { 2223sub _draw {
2095 my ($self) = @_; 2224 my ($self) = @_;
2096 2225
2097 $self->SUPER::_draw (); 2226 $self->SUPER::_draw ();
2098 2227
2099 my ($w, $h) = @$self{qw(w h)}; 2228 glScale $self->{w}, $self->{h};
2100 2229
2101 if ($self->{vertical}) { 2230 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2231 # draw a vertical slider like a rotated horizontal slider
2103 2232
2233 glTranslate 1, 0, 0;
2104 glRotate 90, 0, 0, 1; 2234 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2235 }
2109 2236
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2237 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2238 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2239
2113 my ($value, $lo, $hi, $page) = @{$self->{range}};
2114
2115 $hi = $value + 1 if $lo == $hi;
2116
2117 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2118 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2119
2120 $page = int $page * $inner_w / ($hi - $lo);
2121 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2122
2123 $w -= $page;
2124 $page &= ~1;
2125 glTranslate $page * 0.5, 0, 0;
2126 $page ||= 2;
2127
2128 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130
2131 glEnable GL_BLEND;
2132 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133 glEnable GL_TEXTURE_2D; 2240 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2242
2136 # draw background 2243 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2244 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2245
2139 # draw handle 2246 # draw handle
2140 $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);
2141 2248
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2249 glDisable GL_TEXTURE_2D;
2144} 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 (@_) }
2145 2292
2146############################################################################# 2293#############################################################################
2147 2294
2148package CFClient::UI::TextView; 2295package CFClient::UI::TextView;
2149 2296
… …
2158 fontsize => 1, 2305 fontsize => 1,
2159 can_events => 0, 2306 can_events => 0,
2160 #font => default_font 2307 #font => default_font
2161 @_, 2308 @_,
2162 2309
2163 layout => (new CFClient::Layout), 2310 layout => (new CFClient::Layout 1),
2164 par => [], 2311 par => [],
2165 height => 0, 2312 height => 0,
2166 children => [ 2313 children => [
2167 (new CFClient::UI::Empty expand => 1), 2314 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2315 (new CFClient::UI::Slider vertical => 1),
… …
2179 2326
2180 $self->{fontsize} = $fontsize; 2327 $self->{fontsize} = $fontsize;
2181 $self->reflow; 2328 $self->reflow;
2182} 2329}
2183 2330
2184sub text_height {
2185 my ($self, $text) = @_;
2186
2187 my $layout = $self->{layout};
2188
2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190 $layout->set_width ($self->{children}[0]{w});
2191 $layout->set_text ($text);
2192
2193 ($layout->size)[1]
2194}
2195
2196sub reflow {
2197 my ($self) = @_;
2198
2199 $self->{need_reflow}++;
2200 $self->update;
2201}
2202
2203sub size_allocate { 2331sub size_allocate {
2204 my ($self, $w, $h) = @_; 2332 my ($self, $w, $h) = @_;
2205 2333
2206 $self->SUPER::size_allocate ($w, $h); 2334 $self->SUPER::size_allocate ($w, $h);
2207 2335
… …
2210 $self->{layout}->set_width ($self->{children}[0]{w}); 2338 $self->{layout}->set_width ($self->{children}[0]{w});
2211 2339
2212 $self->reflow; 2340 $self->reflow;
2213} 2341}
2214 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
2215sub add_paragraph { 2377sub add_paragraph {
2216 my ($self, $color, $text) = @_; 2378 my ($self, $color, $text, $indent) = @_;
2217 2379
2218 #TODO: intelligently "reformat" paragraph 2380 for my $line (split /\n/, $text) {
2219 2381 my ($w, $h) = $self->text_size ($line);
2220 my $height = $self->text_height ($text);
2221
2222 $self->{height} += $height; 2382 $self->{height} += $h;
2383 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2384 }
2223 2385
2224 push @{$self->{par}}, [$height, $color, $text];
2225
2226 $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]);
2227 $self->{children}[1]->update;
2228} 2387}
2229 2388
2230sub update { 2389sub update {
2231 my ($self) = @_; 2390 my ($self) = @_;
2232 2391
… …
2234 2393
2235 return unless $self->{h} > 0; 2394 return unless $self->{h} > 0;
2236 2395
2237 delete $self->{texture}; 2396 delete $self->{texture};
2238 2397
2239 $ROOT->on_refresh ($self, sub { 2398 $ROOT->on_post_alloc ($self, sub {
2399 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2400
2240 if (delete $self->{need_reflow}) { 2401 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2402 my $height = 0;
2242 2403
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2404 my $layout = $self->{layout};
2405
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407
2244 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 }
2245 2419
2246 $self->{height} = $height; 2420 $self->{height} = $height;
2247 2421
2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2422 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2249 2423
2250 delete $self->{texture}; 2424 delete $self->{texture};
2251 } 2425 }
2252 2426
2253 $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 {
2254 glClearColor 0, 0, 0, 0; 2428 glClearColor 0.5, 0.5, 0.5, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2429 glClear GL_COLOR_BUFFER_BIT;
2256 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
2257 glEnable GL_BLEND; 2442 glEnable GL_BLEND;
2443 #TODO# not correct in windows where rgba is forced off
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2444 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0];
2263
2264 my $y0 = $top;
2265 my $y1 = $top + $self->{h};
2266
2267 my $y = 0;
2268
2269 my $layout = $self->{layout};
2270
2271 $layout->set_font ($self->{font}) if $self->{font};
2272 2445
2273 for my $par (@{$self->{par}}) { 2446 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2447 my $h = $par->[1];
2275 2448
2276 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]);
2277 $layout->set_text ($par->[2]); 2452 $layout->set_markup ($par->[4]);
2278 2453
2279 glColor @{ $par->[1] }; 2454 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 my ($W, $H) = $layout->size; 2455
2281 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;
2282 } 2458 }
2283 2459
2284 $y += $h; 2460 $y += $h;
2285 } 2461 }
2286 2462
2287 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND; 2463 glDisable GL_BLEND;
2289 }; 2464 };
2290 }); 2465 });
2291} 2466}
2292 2467
2293sub _draw { 2468sub _draw {
2294 my ($self) = @_; 2469 my ($self) = @_;
2295 2470
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2471 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2473 glColor 1, 1, 1, 1;
2301 $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});
2302 glDisable GL_TEXTURE_2D; 2475 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2476
2305 $self->{children}[1]->draw; 2477 $self->{children}[1]->draw;
2306 2478
2307} 2479}
2308 2480
… …
2376 2548
2377 # TODO: use animation 2549 # TODO: use animation
2378 if ($self->{state} = !$self->{state}) { 2550 if ($self->{state} = !$self->{state}) {
2379 $CFClient::UI::ROOT->add ($self->{other}); 2551 $CFClient::UI::ROOT->add ($self->{other});
2380 $self->{other}->move ($self->coord2global (0, $self->{h})); 2552 $self->{other}->move ($self->coord2global (0, $self->{h}));
2381 $self->emit ("open"); 2553 $self->_emit ("open");
2382 } else { 2554 } else {
2383 $CFClient::UI::ROOT->remove ($self->{other}); 2555 $CFClient::UI::ROOT->remove ($self->{other});
2384 $self->emit ("close"); 2556 $self->_emit ("close");
2385 } 2557 }
2386 2558
2387 $self->emit (changed => $self->{state}); 2559 $self->_emit (changed => $self->{state});
2388} 2560}
2389 2561
2390############################################################################# 2562#############################################################################
2391 2563
2392package CFClient::UI::Tooltip; 2564package CFClient::UI::Tooltip;
… …
2402 @_, 2574 @_,
2403 can_events => 0, 2575 can_events => 0,
2404 ) 2576 )
2405} 2577}
2406 2578
2407sub set_markup { 2579sub set_tooltip_from {
2408 my ($self, $text) = @_; 2580 my ($self, $widget) = @_;
2409 2581
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2582 $self->add (new CFClient::UI::Label
2411 $self->{label}->set_markup ($text); 2583 markup => $widget->{tooltip},
2412 $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 );
2413} 2590}
2414 2591
2415sub size_request { 2592sub size_request {
2416 my ($self) = @_; 2593 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2594
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2595 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2596
2422 ($w + 4, $h + 4) 2597 ($w + 4, $h + 4)
2423} 2598}
… …
2429} 2604}
2430 2605
2431sub _draw { 2606sub _draw {
2432 my ($self) = @_; 2607 my ($self) = @_;
2433 2608
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2609 glTranslate 0.375, 0.375;
2436 2610
2437 my ($w, $h) = @$self{qw(w h)}; 2611 my ($w, $h) = @$self{qw(w h)};
2438 2612
2439 glColor 1, 0.8, 0.4; 2613 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2624 glVertex 0 , $h;
2451 glVertex $w, $h; 2625 glVertex $w, $h;
2452 glVertex $w, 0; 2626 glVertex $w, 0;
2453 glEnd; 2627 glEnd;
2454 2628
2455 glPopMatrix; 2629 glTranslate 2 - 0.375, 2 - 0.375;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2630 $self->SUPER::_draw;
2459} 2631}
2460 2632
2461############################################################################# 2633#############################################################################
2462 2634
… …
2467use CFClient::OpenGL; 2639use CFClient::OpenGL;
2468 2640
2469sub new { 2641sub new {
2470 my $class = shift; 2642 my $class = shift;
2471 2643
2472 $class->SUPER::new ( 2644 my $self = $class->SUPER::new (
2473 aspect => 1, 2645 aspect => 1,
2646 can_events => 0,
2474 @_, 2647 @_,
2475 ) 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
2476} 2665}
2477 2666
2478sub size_request { 2667sub size_request {
2479 (32, 8) 2668 (32, 8)
2480} 2669}
2481 2670
2671sub update {
2672 my ($self) = @_;
2673
2674 return unless $self->{visible};
2675
2676 $self->SUPER::update;
2677}
2678
2482sub _draw { 2679sub _draw {
2483 my ($self) = @_; 2680 my ($self) = @_;
2484 2681
2485 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
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2693 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487 2694
2488 # TODO animation
2489 if ($tex) { 2695 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2696 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2698 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2699 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2700 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2701 }
2702}
2703
2704sub DESTROY {
2705 my ($self) = @_;
2706
2707 $self->{timer}->cancel
2708 if $self->{timer};
2709
2710 $self->SUPER::DESTROY;
2499} 2711}
2500 2712
2501############################################################################# 2713#############################################################################
2502 2714
2503package CFClient::UI::InventoryItem; 2715package CFClient::UI::Inventory;
2504 2716
2505our @ISA = CFClient::UI::HBox::; 2717our @ISA = CFClient::UI::ScrolledWindow::;
2506 2718
2507sub new { 2719sub new {
2508 my $class = shift; 2720 my $class = shift;
2509 2721
2510 my %args = @_;
2511
2512 my $item = $args{item};
2513
2514 my $desc = $item->{nrof} < 2
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518
2519 my $self = $class->SUPER::new ( 2722 my $self = $class->SUPER::new (
2520 can_hover => 1, 2723 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2521 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_;
2526
2527 # todo: maybe put examine on 1? but should just be a tooltip :(
2528 if ($ev->{button} == 1) {
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2530 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2543 ],
2544 )->popup ($ev);
2545 }
2546
2547 1
2548 },
2549 %args
2550 );
2551 $self->add(new CFClient::UI::Face
2552 can_events => 0,
2553 face => $item->{face},
2554 anim => $item->{anim},
2555 animspeed => $item->{animspeed});
2556 $self->add(new CFClient::UI::Label
2557 can_events => 0,
2558 text => $desc);
2559
2560 $self
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Inventory;
2566
2567our @ISA = CFClient::UI::ScrolledWindow::;
2568
2569sub new {
2570 my $class = shift;
2571
2572 my $self = $class->SUPER::new (
2573 scrolled => (new CFClient::UI::VBox),
2574 @_, 2724 @_,
2575 ); 2725 );
2576 2726
2577 $self 2727 $self
2578} 2728}
… …
2581 my ($self, $items) = @_; 2731 my ($self, $items) = @_;
2582 2732
2583 $self->{scrolled}->clear; 2733 $self->{scrolled}->clear;
2584 return unless $items; 2734 return unless $items;
2585 2735
2586 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;
2587 2740
2588 $self->{real_items} = \@items; 2741 $self->{real_items} = \@items;
2589 2742
2743 my $row = 0;
2590 for my $item (@items) { 2744 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2 2745 CFClient::Item::update_widgets $item;
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594 2746
2595 $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++;
2596 } 2752 }
2597 2753
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599} 2755}
2600 2756
… …
2643 2799
2644# 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)
2645sub popup { 2801sub popup {
2646 my ($self, $ev) = @_; 2802 my ($self, $ev) = @_;
2647 2803
2648 $self->emit ("popdown"); 2804 $self->_emit ("popdown");
2649 2805
2650 # maybe save $GRAB? must be careful about events... 2806 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self; 2807 $GRAB = $self;
2652 $self->{button} = $ev->{button}; 2808 $self->{button} = $ev->{button};
2653 2809
… …
2668 2824
2669 if ($ev->{button} == $self->{button}) { 2825 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB; 2826 undef $GRAB;
2671 $self->hide; 2827 $self->hide;
2672 2828
2673 $self->emit ("popdown"); 2829 $self->_emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover}; 2830 $self->{hover}[1]->() if $self->{hover};
2675 } 2831 }
2676} 2832}
2677 2833
2678############################################################################# 2834#############################################################################
2679 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
2680package CFClient::UI::Root; 2946package CFClient::UI::Root;
2681 2947
2682our @ISA = CFClient::UI::Container::; 2948our @ISA = CFClient::UI::Container::;
2683 2949
2684use CFClient::OpenGL; 2950use CFClient::OpenGL;
2685 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
2686sub check_size { 2967sub check_size {
2687 my ($self) = @_; 2968 my ($self) = @_;
2688 2969
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 2970 $self->size_allocate ($self->{w}, $self->{h})
2971 if $self->{w};
2690} 2972}
2691 2973
2692sub size_request { 2974sub size_request {
2693 my ($self) = @_; 2975 my ($self) = @_;
2694 2976
… …
2696} 2978}
2697 2979
2698sub size_allocate { 2980sub size_allocate {
2699 my ($self, $w, $h) = @_; 2981 my ($self, $w, $h) = @_;
2700 2982
2701 my $old_w = $self->{old_w};
2702 my $old_h = $self->{old_h};
2703
2704 if ($old_w && $old_h) {
2705 for my $child ($self->children) {
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{req_w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 }
2715 }
2716
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2719}
2720
2721sub configure {
2722 my ($self, $x, $y, $w, $h) = @_;
2723
2724 $self->SUPER::configure ($x, $y, $w, $h);
2725
2726 for my $child ($self->children) { 2983 for my $child ($self->children) {
2727 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)};
2728 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
2729 $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;
2730 $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
2731 $child->configure ($X, $Y, $W, $H); 2995 $child->configure ($X, $Y, $W, $H);
2732 } 2996 }
2733} 2997}
2734 2998
2735sub _topleft { 2999sub coord2local {
2736 my ($self, $x, $y) = @_; 3000 my ($self, $x, $y) = @_;
2737 3001
2738 ($x, $y) 3002 ($x, $y)
2739} 3003}
2740 3004
3005sub coord2global {
3006 my ($self, $x, $y) = @_;
3007
3008 ($x, $y)
3009}
3010
2741sub update { 3011sub update {
2742 my ($self) = @_; 3012 my ($self) = @_;
2743 3013
2744 $self->check_size; 3014 $self->check_size;
2745 ::refresh (); 3015 $::WANT_REFRESH++;
2746} 3016}
2747 3017
2748sub add { 3018sub add {
2749 my ($self, $child) = @_; 3019 my ($self, @children) = @_;
2750 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
2751 # integerize window positions 3030 # integerise window positions
2752 $child->{x} = int $child->{x}; 3031 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y}; 3032 $child->{y} = int $child->{y};
3033 }
2754 3034
2755 $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 }
2756} 3048}
2757 3049
2758sub on_refresh { 3050sub on_refresh {
2759 my ($self, $id, $cb) = @_; 3051 my ($self, $id, $cb) = @_;
2760 3052
2761 $self->{refresh_hook}{$id} = $cb; 3053 $self->{refresh_hook}{$id} = $cb;
2762} 3054}
2763 3055
3056sub on_post_alloc {
3057 my ($self, $id, $cb) = @_;
3058
3059 $self->{post_alloc_hook}{$id} = $cb;
3060}
3061
2764sub draw { 3062sub draw {
2765 my ($self) = @_; 3063 my ($self) = @_;
2766 3064
2767 while (my $rcb = delete $self->{refresh_hook}) { 3065 while ($self->{refresh_hook}) {
2768 $_->() 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}};
2769 } 3117 }
2770 3118
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3119 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3120 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3121 glClear GL_COLOR_BUFFER_BIT;
2774 3122
2775 glMatrixMode GL_PROJECTION; 3123 glMatrixMode GL_PROJECTION;
2776 glLoadIdentity; 3124 glLoadIdentity;
2777 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3125 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778 glMatrixMode GL_MODELVIEW; 3126 glMatrixMode GL_MODELVIEW;
2779 glLoadIdentity; 3127 glLoadIdentity;
2780 3128
2781 $self->_draw; 3129 $self->_draw;
2782} 3130}
… …
2784############################################################################# 3132#############################################################################
2785 3133
2786package CFClient::UI; 3134package CFClient::UI;
2787 3135
2788$ROOT = new CFClient::UI::Root; 3136$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip; 3137$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790 3138
27911 31391
2792 3140

Diff Legend

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