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.187 by root, Mon May 8 20:40:31 2006 UTC vs.
Revision 1.239 by root, Thu May 25 22:29:57 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 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
403} 471}
404 472
405sub check_size { 473sub check_size {
406 my ($self) = @_; 474 my ($self, $forced) = @_;
407 475
408 $self->{parent} 476 $self->{force_alloc} = 1 if $forced;
409 or return 1; 477 $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} 478}
430 479
431sub update { 480sub update {
432 my ($self) = @_; 481 my ($self) = @_;
433 482
… …
439 my ($self, $signal, $cb) = @_; 488 my ($self, $signal, $cb) = @_;
440 489
441 push @{ $self->{signal_cb}{$signal} }, $cb; 490 push @{ $self->{signal_cb}{$signal} }, $cb;
442} 491}
443 492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
444sub emit { 499sub emit {
445 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
446 501
447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
448} 504}
449 505
450sub DESTROY { 506sub DESTROY {
451 my ($self) = @_; 507 my ($self) = @_;
452 508
509 delete $WIDGET{$self+0};
453 #$self->deactivate; 510 #$self->deactivate;
454} 511}
455 512
456############################################################################# 513#############################################################################
457 514
… …
466 my $class = shift; 523 my $class = shift;
467 524
468 # range [value, low, high, page] 525 # range [value, low, high, page]
469 526
470 $class->SUPER::new ( 527 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 528 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 529 #active_bg => [1, 1, 1, 0.5],
473 @_ 530 @_
474 ) 531 )
475} 532}
476 533
477sub _draw { 534sub _draw {
478 my ($self) = @_; 535 my ($self) = @_;
479 536
537 my $color = $FOCUS == $self && $self->{active_bg}
538 ? $self->{active_bg}
539 : $self->{bg};
540
541 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 542 my ($w, $h) = @$self{qw(w h)};
481 543
482 glEnable GL_BLEND; 544 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 546 glColor @$color;
485 547
486 glBegin GL_QUADS; 548 glBegin GL_QUADS;
487 glVertex 0 , 0; 549 glVertex 0 , 0;
488 glVertex 0 , $h; 550 glVertex 0 , $h;
489 glVertex $w, $h; 551 glVertex $w, $h;
490 glVertex $w, 0; 552 glVertex $w, 0;
491 glEnd; 553 glEnd;
492 554
493 glDisable GL_BLEND; 555 glDisable GL_BLEND;
556 }
494} 557}
495 558
496############################################################################# 559#############################################################################
497 560
498package CFClient::UI::Empty; 561package CFClient::UI::Empty;
… …
530 593
531 $self 594 $self
532} 595}
533 596
534sub add { 597sub add {
535 my ($self, $child) = @_; 598 my ($self, @widgets) = @_;
536 599
537 $child->set_parent ($self); 600 $_->set_parent ($self)
601 for @widgets;
538 602
539 use sort 'stable'; 603 use sort 'stable';
540 604
541 $self->{children} = [ 605 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 606 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 607 @{$self->{children}}, @widgets
544 ]; 608 ];
545 609
546 $child->check_size; 610 $self->check_size (1);
547 $self->update; 611 $self->update;
548} 612}
549 613
550sub children { 614sub children {
551 @{ $_[0]{children} } 615 @{ $_[0]{children} }
… …
557 delete $child->{parent}; 621 delete $child->{parent};
558 $child->hide; 622 $child->hide;
559 623
560 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
561 625
562 $self->check_size; 626 $self->check_size (1);
563 $self->update; 627 $self->update;
564} 628}
565 629
566sub clear { 630sub clear {
567 my ($self) = @_; 631 my ($self) = @_;
… …
658} 722}
659 723
660sub update { 724sub update {
661 my ($self) = @_; 725 my ($self) = @_;
662 726
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 727 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 728 $self->SUPER::update;
665} 729}
666 730
667sub size_allocate { 731sub size_allocate {
668 my ($self, $w, $h) = @_; 732 my ($self, $w, $h) = @_;
… …
681 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
682 glClearColor 0, 0, 0, 0; 746 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT; 747 glClear GL_COLOR_BUFFER_BIT;
684 748
685 $self->_render; 749 $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 }; 750 };
694} 751}
695 752
696sub _draw { 753sub _draw {
697 my ($self) = @_; 754 my ($self) = @_;
… …
699 my ($w, $h) = ($self->w, $self->h); 756 my ($w, $h) = ($self->w, $self->h);
700 757
701 my $tex = $self->{texture} 758 my $tex = $self->{texture}
702 or return; 759 or return;
703 760
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 761 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 763 glColor 1, 1, 1, 1;
709 764
710 $tex->draw_quad (0, 0, $w, $h); 765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 766
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 767 glDisable GL_TEXTURE_2D;
714} 768}
715 769
716############################################################################# 770#############################################################################
717 771
718package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
719 773
720our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
721 775
776sub new {
777 my $class = shift;
778
779 $class->SUPER::new (
780 scroll_x => 0,
781 scroll_y => 1,
782 @_,
783 )
784}
785
722sub size_request { 786sub size_request {
723 my ($self) = @_; 787 my ($self) = @_;
724 788
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 789 @$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 790
728 @$self{qw(child_w child_h)} 791 @$self{qw(child_w child_h)}
729} 792}
730 793
731sub size_allocate { 794sub size_allocate {
732 my ($self, $w, $h) = @_; 795 my ($self, $w, $h) = @_;
733 796
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799
800 $self->child->configure (0, 0, $w, $h);
734 $self->update; 801 $self->update;
735} 802}
736 803
737sub set_offset { 804sub set_offset {
738 my ($self, $x, $y) = @_; 805 my ($self, $x, $y) = @_;
… …
741 $self->{view_y} = int $y; 808 $self->{view_y} = int $y;
742 809
743 $self->update; 810 $self->update;
744} 811}
745 812
746# hmm, this does not work for topleft of $self... but we should not aks for that 813# hmm, this does not work for topleft of $self... but we should not ask for that
747sub _topleft { 814sub coord2local {
748 my ($self, $x, $y) = @_; 815 my ($self, $x, $y) = @_;
749 816
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 817 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
818}
819
820sub coord2global {
821 my ($self, $x, $y) = @_;
822
823 $x = List::Util::min $self->{w}, $x - $self->{view_x};
824 $y = List::Util::min $self->{h}, $y - $self->{view_y};
825
826 $self->SUPER::coord2global ($x, $y)
751} 827}
752 828
753sub find_widget { 829sub find_widget {
754 my ($self, $x, $y) = @_; 830 my ($self, $x, $y) = @_;
755 831
… …
783 859
784 my $slider = new CFClient::UI::Slider 860 my $slider = new CFClient::UI::Slider
785 vertical => 1, 861 vertical => 1,
786 range => [0, 0, 1, 0.01], # HACK fix 862 range => [0, 0, 1, 0.01], # HACK fix
787 connect_changed => sub { 863 connect_changed => sub {
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 864 $self->{vp}->set_offset (0, $_[1]);
789 }, 865 },
790 ; 866 ;
791 867
792 $self = $class->SUPER::new ( 868 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort), 869 vp => (new CFClient::UI::ViewPort expand => 1),
794 slider => $slider, 870 slider => $slider,
795 @_, 871 @_,
796 ); 872 );
797 873
798 $self->{vp}->add ($self->{scrolled}); 874 $self->{vp}->add ($self->{scrolled});
… …
800 $self->add ($self->{slider}); 876 $self->add ($self->{slider});
801 877
802 $self 878 $self
803} 879}
804 880
881sub update {
882 my ($self) = @_;
883
884 $self->SUPER::update;
885
886 # todo: overwrite size_allocate of child
887 my $child = $self->{vp}->child;
888 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
889}
890
891sub size_allocate {
892 my ($self, $w, $h) = @_;
893
894 $self->SUPER::size_allocate ($w, $h);
895
896 my $child = $self->{vp}->child;
897 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
898}
899
805#TODO# update range on size_allocate depeneing on child 900#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 901# update viewport offset on scroll
807 902
808############################################################################# 903#############################################################################
809 904
810package CFClient::UI::Frame; 905package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 909use CFClient::OpenGL;
815 910
816sub new { 911sub new {
817 my $class = shift; 912 my $class = shift;
818 913
819 my $self = $class->SUPER::new ( 914 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 915 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 916 @_,
824 ); 917 )
825
826 $self
827} 918}
828 919
829sub _draw { 920sub _draw {
830 my ($self) = @_; 921 my ($self) = @_;
831 922
832 my ($w, $h) = ($self->{w}, $self->{h}); 923 if ($self->{bg}) {
924 my ($w, $h) = @$self{qw(w h)};
833 925
834 glEnable GL_BLEND; 926 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 927 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 928 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 929
839# glBegin GL_QUADS; 930 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 931 glVertex 0 , 0;
842# glVertex 0 , $h; 932 glVertex 0 , $h;
843# glVertex $w, $h; 933 glVertex $w, $h;
844# glVertex $w, 0; 934 glVertex $w, 0;
845# glEnd; 935 glEnd;
846 936
847
848 $self->child->draw;
849 glDisable GL_BLEND; 937 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 938 }
939
940 $self->SUPER::_draw;
851} 941}
852 942
853############################################################################# 943#############################################################################
854 944
855package CFClient::UI::FancyFrame; 945package CFClient::UI::FancyFrame;
… …
866 my $class = shift; 956 my $class = shift;
867 957
868 # TODO: user_x, user_y, overwrite moveto? 958 # TODO: user_x, user_y, overwrite moveto?
869 959
870 my $self = $class->SUPER::new ( 960 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 961 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 962 border_bg => [1, 1, 1, 1],
873 border => 0.6, 963 border => 0.6,
964 is_toplevel => 1,
874 can_events => 1, 965 can_events => 1,
875 @_ 966 @_
876 ); 967 );
877 968
878 $self->{title} &&= new CFClient::UI::Label 969 $self->{title} &&= new CFClient::UI::Label
879 align => 0, 970 align => 0,
… …
903 my ($self, $w, $h) = @_; 994 my ($self, $w, $h) = @_;
904 995
905 $h -= List::Util::max 0, $self->border * 2; 996 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 997 $w -= List::Util::max 0, $self->border * 2;
907 998
908 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 999 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
909 if $self->{title}; 1000 if $self->{title};
910 1001
911 $self->child->configure ($self->border, $self->border, $w, $h); 1002 $self->child->configure ($self->border, $self->border, $w, $h);
912} 1003}
913 1004
… …
971 my ($self) = @_; 1062 my ($self) = @_;
972 1063
973 my ($w, $h ) = ($self->{w}, $self->{h}); 1064 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1065 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 1066
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 1067 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 1069
981 my $border = $self->border; 1070 my $border = $self->border;
982 1071
983 glColor @{ $self->{border_bg} }; 1072 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 1073 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 1074 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1075 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1076 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988 1077
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1078 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 1079 my $bg = $tex[0];
991 1080
992 # TODO: repeat texture not scale 1081 # TODO: repeat texture not scale
… …
996 glColor @{ $self->{bg} }; 1085 glColor @{ $self->{bg} };
997 1086
998 $bg->{s} = $rep_x; 1087 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y; 1088 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1; 1089 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 1090 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1091 }
1002 1092
1003 glDisable GL_TEXTURE_2D; 1093 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1094
1007 $self->{title}->draw if $self->{title}; 1095 $self->{title}->draw if $self->{title};
1008 1096
1009 $self->child->draw; 1097 $self->child->draw;
1010} 1098}
… …
1022sub new { 1110sub new {
1023 my $class = shift; 1111 my $class = shift;
1024 1112
1025 $class->SUPER::new ( 1113 $class->SUPER::new (
1026 col_expand => [], 1114 col_expand => [],
1027 @_ 1115 @_,
1028 ) 1116 )
1117}
1118
1119sub children {
1120 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1029} 1121}
1030 1122
1031sub add { 1123sub add {
1032 my ($self, $x, $y, $child) = @_; 1124 my ($self, $x, $y, $child) = @_;
1033 1125
1034 $child->set_parent ($self); 1126 $child->set_parent ($self);
1035 $self->{children}[$y][$x] = $child; 1127 $self->{children}[$y][$x] = $child;
1036 1128
1037 $child->check_size; 1129 $self->check_size (1);
1038} 1130}
1039 1131
1040sub children {
1041 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1042}
1043
1044# TODO: move to container class maybe? send childs a signal on removal? 1132# TODO: move to container class maybe? send children a signal on removal?
1045sub clear { 1133sub clear {
1046 my ($self) = @_; 1134 my ($self) = @_;
1047 1135
1048 my @children = $self->children; 1136 my @children = $self->children;
1049 delete $self->{children}; 1137 delete $self->{children};
… …
1051 for (@children) { 1139 for (@children) {
1052 delete $_->{parent}; 1140 delete $_->{parent};
1053 $_->hide; 1141 $_->hide;
1054 } 1142 }
1055 1143
1144 $self->check_size (1);
1056 $self->update; 1145 $self->update;
1057} 1146}
1058 1147
1059sub get_wh { 1148sub get_wh {
1060 my ($self) = @_; 1149 my ($self) = @_;
… …
1092sub size_allocate { 1181sub size_allocate {
1093 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1094 1183
1095 my ($ws, $hs) = $self->get_wh; 1184 my ($ws, $hs) = $self->get_wh;
1096 1185
1097 my $req_w = sum @$ws; 1186 my $req_w = (sum @$ws) || 1;
1098 my $req_h = sum @$hs; 1187 my $req_h = (sum @$hs) || 1;
1099 1188
1100 # TODO: nicer code && do row_expand 1189 # TODO: nicer code && do row_expand
1101 my @col_expand = @{$self->{col_expand}}; 1190 my @col_expand = @{$self->{col_expand}};
1102 @col_expand = (1) x @$ws unless @col_expand; 1191 @col_expand = (1) x @$ws unless @col_expand;
1103 my $col_expand = (sum @col_expand) || 1; 1192 my $col_expand = (sum @col_expand) || 1;
… …
1237} 1326}
1238 1327
1239sub size_allocate { 1328sub size_allocate {
1240 my ($self, $w, $h) = @_; 1329 my ($self, $w, $h) = @_;
1241 1330
1331 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1332
1242 my $children = $self->{children}; 1333 my $children = $self->{children};
1243 1334
1244 my @h = map $_->{req_h}, @$children; 1335 my @h = map $_->{req_h}, @$children;
1245 1336
1246 my $req_h = List::Util::sum @h; 1337 my $req_h = List::Util::sum @h;
… …
1275 1366
1276############################################################################# 1367#############################################################################
1277 1368
1278package CFClient::UI::Label; 1369package CFClient::UI::Label;
1279 1370
1280our @ISA = CFClient::UI::Base::; 1371our @ISA = CFClient::UI::DrawBG::;
1281 1372
1282use CFClient::OpenGL; 1373use CFClient::OpenGL;
1283 1374
1284sub new { 1375sub new {
1285 my ($class, %arg) = @_; 1376 my ($class, %arg) = @_;
1286 1377
1287 my $self = $class->SUPER::new ( 1378 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1379 fg => [1, 1, 1],
1380 #bg => none
1381 #active_bg => none
1289 #font => default_font 1382 #font => default_font
1383 #text => initial text
1384 #markup => initial narkup
1385 #max_w => maximum pixel width
1386 ellipsise => 3, # end
1387 layout => (new CFClient::Layout),
1290 fontsize => 1, 1388 fontsize => 1,
1291 text => "",
1292 align => -1, 1389 align => -1,
1293 valign => -1, 1390 valign => -1,
1294 padding => 2, 1391 padding => 2,
1295 layout => new CFClient::Layout,
1296 can_events => 0, 1392 can_events => 0,
1297 %arg 1393 %arg
1298 ); 1394 );
1299 1395
1300 if (exists $self->{template}) { 1396 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1397 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1398 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1399 $self->{template} = $layout;
1304 } 1400 }
1305 1401
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1402 if (exists $self->{markup}) {
1307 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1403 $self->set_markup (delete $self->{markup});
1404 } else {
1405 $self->set_text (delete $self->{text});
1406 }
1308 1407
1309 $self 1408 $self
1310} 1409}
1311 1410
1312sub escape { 1411sub escape($) {
1313 local $_ = $_[1]; 1412 local $_ = $_[0];
1314 1413
1315 s/&/&amp;/g; 1414 s/&/&amp;/g;
1316 s/>/&gt;/g; 1415 s/>/&gt;/g;
1317 s/</&lt;/g; 1416 s/</&lt;/g;
1318 1417
1319 $_[1] 1418 $_
1320} 1419}
1321 1420
1322sub update { 1421sub update {
1323 my ($self) = @_; 1422 my ($self) = @_;
1324 1423
… …
1330 my ($self, $text) = @_; 1429 my ($self, $text) = @_;
1331 1430
1332 return if $self->{text} eq "T$text"; 1431 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1432 $self->{text} = "T$text";
1334 1433
1434 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1435 $self->{layout}->set_text ($text);
1336 1436
1337 delete $self->{texture};
1338 $self->update; 1437 $self->update;
1339 $self->check_size; 1438 $self->check_size;
1340} 1439}
1341 1440
1342sub set_markup { 1441sub set_markup {
1343 my ($self, $markup) = @_; 1442 my ($self, $markup) = @_;
1344 1443
1345 return if $self->{text} eq "M$markup"; 1444 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1445 $self->{text} = "M$markup";
1347 1446
1447 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1448
1449 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1450 $self->{layout}->set_markup ($markup);
1349 1451
1350 delete $self->{texture};
1351 $self->update; 1452 $self->update;
1352 $self->check_size; 1453 $self->check_size;
1353} 1454}
1354 1455
1355sub size_request { 1456sub size_request {
1356 my ($self) = @_; 1457 my ($self) = @_;
1357 1458
1358 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1459 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $self->{layout}->set_width ($self->{max_w} || -1); 1460 $self->{layout}->set_width ($self->{max_w} || -1);
1461 $self->{layout}->set_ellipsise ($self->{ellipsise});
1462 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1463 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361 1464
1362 my ($w, $h) = $self->{layout}->size; 1465 my ($w, $h) = $self->{layout}->size;
1363 1466
1364 if (exists $self->{template}) { 1467 if (exists $self->{template}) {
… …
1394} 1497}
1395 1498
1396sub _draw { 1499sub _draw {
1397 my ($self) = @_; 1500 my ($self) = @_;
1398 1501
1502 $self->SUPER::_draw; # draw background, if applicable
1503
1399 my $tex = $self->{texture} ||= do { 1504 my $tex = $self->{texture} ||= do {
1505 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1506 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1507 $self->{layout}->set_width ($self->{w});
1508 $self->{layout}->set_ellipsise ($self->{ellipsise});
1509 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1511
1403 new_from_layout CFClient::Texture $self->{layout} 1512 my $tex = new_from_layout CFClient::Texture $self->{layout};
1513
1514 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1515 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1516 : ($self->{w} - $tex->{w}) * 0.5);
1517
1518 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1519 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1520 : ($self->{h} - $tex->{h}) * 0.5);
1521
1522 $tex
1404 }; 1523 };
1405 1524
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1525 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1527
1528 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1529 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}); 1530 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1531 } else {
1532 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1533 }
1426 1534
1427 glDisable GL_TEXTURE_2D; 1535 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1536}
1430 1537
1431############################################################################# 1538#############################################################################
1432 1539
1433package CFClient::UI::EntryBase; 1540package CFClient::UI::EntryBase;
… …
1446 active_fg => [0, 0, 0], 1553 active_fg => [0, 0, 0],
1447 can_hover => 1, 1554 can_hover => 1,
1448 can_focus => 1, 1555 can_focus => 1,
1449 valign => 0, 1556 valign => 0,
1450 can_events => 1, 1557 can_events => 1,
1558 #text => ...
1451 @_ 1559 @_
1452 ) 1560 )
1453} 1561}
1454 1562
1455sub _set_text { 1563sub _set_text {
… …
1465 $self->{text} = $text; 1573 $self->{text} = $text;
1466 1574
1467 $text =~ s/./*/g if $self->{hidden}; 1575 $text =~ s/./*/g if $self->{hidden};
1468 $self->{layout}->set_text ("$text "); 1576 $self->{layout}->set_text ("$text ");
1469 1577
1470 $self->emit (changed => $self->{text}); 1578 $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} 1579}
1490 1580
1491sub set_text { 1581sub set_text {
1492 my ($self, $text) = @_; 1582 my ($self, $text) = @_;
1493 1583
1494 $self->{cursor} = length $text; 1584 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1585 $self->_set_text ($text);
1496 $self->update; 1586 $self->update;
1587 $self->check_size;
1588}
1589
1590sub get_text {
1591 $_[0]{text}
1592}
1593
1594sub size_request {
1595 my ($self) = @_;
1596
1597 my ($w, $h) = $self->SUPER::size_request;
1598
1599 ($w + 1, $h) # add 1 for cursor
1497} 1600}
1498 1601
1499sub key_down { 1602sub key_down {
1500 my ($self, $ev) = @_; 1603 my ($self, $ev) = @_;
1501 1604
… …
1503 my $sym = $ev->{sym}; 1606 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1607 my $uni = $ev->{unicode};
1505 1608
1506 my $text = $self->get_text; 1609 my $text = $self->get_text;
1507 1610
1508 if ($sym == 8) { 1611 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1612 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1613 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1614 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1615 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1616 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1617 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1618 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1619 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1620 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1621 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1622 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1623 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1624 $self->_emit ('escape');
1522 } elsif ($uni) { 1625 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1626 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1627 }
1525 1628
1526 $self->_set_text ($text); 1629 $self->_set_text ($text);
1527 $self->update; 1630 $self->update;
1631 $self->check_size;
1528} 1632}
1529 1633
1530sub focus_in { 1634sub focus_in {
1531 my ($self) = @_; 1635 my ($self) = @_;
1532 1636
… …
1612 if ($sym == 13) { 1716 if ($sym == 13) {
1613 unshift @{$self->{history}}, 1717 unshift @{$self->{history}},
1614 my $txt = $self->get_text; 1718 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1; 1719 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = ''; 1720 $self->{history_saveback} = '';
1617 $self->emit (activate => $txt); 1721 $self->_emit (activate => $txt);
1618 $self->update; 1722 $self->update;
1619 1723
1620 } elsif ($sym == CFClient::SDLK_UP) { 1724 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) { 1725 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text; 1726 $self->{history_saveback} = $self->get_text;
… …
1661 my $class = shift; 1765 my $class = shift;
1662 1766
1663 $class->SUPER::new ( 1767 $class->SUPER::new (
1664 padding => 4, 1768 padding => 4,
1665 fg => [1, 1, 1], 1769 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1770 active_fg => [0, 0, 1],
1668 can_hover => 1, 1771 can_hover => 1,
1669 align => 0, 1772 align => 0,
1670 valign => 0, 1773 valign => 0,
1671 can_events => 1, 1774 can_events => 1,
1672 @_ 1775 @_
1673 ) 1776 )
1674} 1777}
1675 1778
1779sub activate { }
1780
1676sub button_up { 1781sub button_up {
1677 my ($self, $ev, $x, $y) = @_; 1782 my ($self, $ev, $x, $y) = @_;
1678 1783
1784 $self->emit ("activate")
1679 if ($x >= 0 && $x < $self->{w} 1785 if $x >= 0 && $x < $self->{w}
1680 && $y >= 0 && $y < $self->{h}) { 1786 && $y >= 0 && $y < $self->{h};
1681 $self->emit ("activate");
1682 }
1683} 1787}
1684 1788
1685sub _draw { 1789sub _draw {
1686 my ($self) = @_; 1790 my ($self) = @_;
1687 1791
… …
1689 1793
1690 if ($GRAB == $self) { 1794 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1795 $self->{fg} = $self->{active_fg};
1692 } 1796 }
1693 1797
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1798 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1800 glColor 0, 0, 0, 1;
1699 1801
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1802 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1803
1702 glDisable GL_TEXTURE_2D; 1804 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1805
1705 $self->SUPER::_draw; 1806 $self->SUPER::_draw;
1706} 1807}
1707 1808
1708############################################################################# 1809#############################################################################
… …
1722 1823
1723 $class->SUPER::new ( 1824 $class->SUPER::new (
1724 padding => 2, 1825 padding => 2,
1725 fg => [1, 1, 1], 1826 fg => [1, 1, 1],
1726 active_fg => [1, 1, 0], 1827 active_fg => [1, 1, 0],
1828 bg => [0, 0, 0, 0.2],
1829 active_bg => [1, 1, 1, 0.5],
1727 state => 0, 1830 state => 0,
1728 can_hover => 1, 1831 can_hover => 1,
1729 @_ 1832 @_
1730 ) 1833 )
1731} 1834}
… …
1740 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1741 1844
1742 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1845 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1743 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1846 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1744 $self->{state} = !$self->{state}; 1847 $self->{state} = !$self->{state};
1745 $self->emit (changed => $self->{state}); 1848 $self->_emit (changed => $self->{state});
1746 } 1849 }
1747} 1850}
1748 1851
1749sub _draw { 1852sub _draw {
1750 my ($self) = @_; 1853 my ($self) = @_;
… …
1755 1858
1756 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1859 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1757 1860
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1861 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1862
1760 glEnable GL_BLEND; 1863 my $tex = $self->{state} ? $tex[1] : $tex[0];
1864
1761 glEnable GL_TEXTURE_2D; 1865 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); 1866 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1867 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1868}
1771 1869
1772############################################################################# 1870#############################################################################
1773 1871
1774package CFClient::UI::Image; 1872package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1915 glTranslate 0, -$self->{w}, 0;
1818 1916
1819 ($w, $h) = ($h, $w); 1917 ($w, $h) = ($h, $w);
1820 } 1918 }
1821 1919
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1920 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1922
1827 $tex->draw_quad (0, 0, $w, $h); 1923 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1924
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1925 glDisable GL_TEXTURE_2D;
1831} 1926}
1832 1927
1833############################################################################# 1928#############################################################################
1834 1929
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2118 qw(s1_slider.png s1_slider_bg.png);
2024 2119
2025sub new { 2120sub new {
2026 my $class = shift; 2121 my $class = shift;
2027 2122
2028 # range [value, low, high, page] 2123 # range [value, low, high, page, unit]
2029 2124
2030 # TODO: 0-width page 2125 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2126 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2127 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2128 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2129 fg => [1, 1, 1],
2035 active_fg => [0, 0, 0], 2130 active_fg => [0, 0, 0],
2131 bg => [0, 0, 0, 0.2],
2132 active_bg => [1, 1, 1, 0.5],
2036 range => [0, 0, 100, 10], 2133 range => [0, 0, 100, 10, 0],
2037 req_w => $::WIDTH / 80, 2134 req_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2135 req_h => $::WIDTH / 80,
2039 vertical => 0, 2136 vertical => 0,
2040 can_hover => 1, 2137 can_hover => 1,
2041 inner_pad => 5, 2138 inner_pad => 0.02,
2042 @_ 2139 @_
2043 ); 2140 );
2044 2141
2142 $self->set_value ($self->{range}[0]);
2143 $self->update;
2144
2045 $self 2145 $self
2146}
2147
2148sub set_range {
2149 my ($self, $range) = @_;
2150
2151 ($range, $self->{range}) = ($self->{range}, $range);
2152
2153 $self->update
2154 if "@$range" ne "@{$self->{range}}";
2155}
2156
2157sub set_value {
2158 my ($self, $value) = @_;
2159
2160 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2161
2162 $hi = $lo + 1 if $hi <= $lo;
2163
2164 $page = $hi - $lo if $page > $hi - $lo;
2165
2166 $value = $lo if $value < $lo;
2167 $value = $hi - $page if $value > $hi - $page;
2168
2169 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2170 if $unit;
2171
2172 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2173
2174 if ($value != $old_value) {
2175 $self->_emit (changed => $value);
2176 $self->update;
2177 }
2046} 2178}
2047 2179
2048sub size_request { 2180sub size_request {
2049 my ($self) = @_; 2181 my ($self) = @_;
2050 2182
… …
2056 2188
2057sub button_down { 2189sub button_down {
2058 my ($self, $ev, $x, $y) = @_; 2190 my ($self, $ev, $x, $y) = @_;
2059 2191
2060 $self->SUPER::button_down ($ev, $x, $y); 2192 $self->SUPER::button_down ($ev, $x, $y);
2193
2194 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2195
2061 $self->mouse_motion ($ev, $x, $y); 2196 $self->mouse_motion ($ev, $x, $y);
2062} 2197}
2063 2198
2064sub mouse_motion { 2199sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2200 my ($self, $ev, $x, $y) = @_;
2066 2201
2067 if ($GRAB == $self) { 2202 if ($GRAB == $self) {
2203 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2204
2205 my (undef, $lo, $hi, $page) = @{$self->{range}};
2206
2207 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2208
2209 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2210 }
2211}
2212
2213sub update {
2214 my ($self) = @_;
2215
2216 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2217 $self->set_value ($self->{range}[0]);
2218
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2219 my ($value, $lo, $hi, $page) = @{$self->{range}};
2220 my $range = ($hi - $page - $lo) || 1e-100;
2069 2221
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2222 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2071 2223
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2224 $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 2225 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2074 2226
2075 $x -= $inner_pad_px; # substract the padding 2227 $value = ($value - $lo) / $range;
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2228 $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 2229
2081 $self->emit (changed => $x); 2230 $self->{knob_x} = $value - $knob_w * 0.5;
2082 $self->update; 2231 $self->{knob_w} = $knob_w;
2083 } 2232 });
2084}
2085 2233
2086# the inner_* stuff is for generating a padding for the slider handle, 2234 $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} 2235}
2093 2236
2094sub _draw { 2237sub _draw {
2095 my ($self) = @_; 2238 my ($self) = @_;
2096 2239
2097 $self->SUPER::_draw (); 2240 $self->SUPER::_draw ();
2098 2241
2099 my ($w, $h) = @$self{qw(w h)}; 2242 glScale $self->{w}, $self->{h};
2100 2243
2101 if ($self->{vertical}) { 2244 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2245 # draw a vertical slider like a rotated horizontal slider
2103 2246
2247 glTranslate 1, 0, 0;
2104 glRotate 90, 0, 0, 1; 2248 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2249 }
2109 2250
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2251 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2252 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2253
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; 2254 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2255 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2256
2136 # draw background 2257 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2258 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2259
2139 # draw handle 2260 # draw handle
2140 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2261 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2141 2262
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2263 glDisable GL_TEXTURE_2D;
2144} 2264}
2265
2266#############################################################################
2267
2268package CFClient::UI::ValSlider;
2269
2270our @ISA = CFClient::UI::HBox::;
2271
2272sub new {
2273 my ($class, %arg) = @_;
2274
2275 my $range = delete $arg{range};
2276
2277 my $self = $class->SUPER::new (
2278 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2279 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2280 to_value => sub { shift },
2281 from_value => sub { shift },
2282 %arg,
2283 );
2284
2285 $self->{slider}->connect (changed => sub {
2286 my ($self, $value) = @_;
2287 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2288 $self->{parent}->emit (changed => $value);
2289 });
2290
2291# $self->{entry}->connect (changed => sub {
2292# my ($self, $value) = @_;
2293# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2294# $self->{parent}->emit (changed => $value);
2295# });
2296
2297 $self->add ($self->{slider}, $self->{entry});
2298
2299 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2300
2301 $self
2302}
2303
2304sub set_range { shift->{slider}->set_range (@_) }
2305sub set_value { shift->{slider}->set_value (@_) }
2145 2306
2146############################################################################# 2307#############################################################################
2147 2308
2148package CFClient::UI::TextView; 2309package CFClient::UI::TextView;
2149 2310
… …
2158 fontsize => 1, 2319 fontsize => 1,
2159 can_events => 0, 2320 can_events => 0,
2160 #font => default_font 2321 #font => default_font
2161 @_, 2322 @_,
2162 2323
2163 layout => (new CFClient::Layout), 2324 layout => (new CFClient::Layout 1),
2164 par => [], 2325 par => [],
2165 height => 0, 2326 height => 0,
2166 children => [ 2327 children => [
2167 (new CFClient::UI::Empty expand => 1), 2328 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2329 (new CFClient::UI::Slider vertical => 1),
… …
2179 2340
2180 $self->{fontsize} = $fontsize; 2341 $self->{fontsize} = $fontsize;
2181 $self->reflow; 2342 $self->reflow;
2182} 2343}
2183 2344
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 { 2345sub size_allocate {
2204 my ($self, $w, $h) = @_; 2346 my ($self, $w, $h) = @_;
2205 2347
2206 $self->SUPER::size_allocate ($w, $h); 2348 $self->SUPER::size_allocate ($w, $h);
2207 2349
… …
2210 $self->{layout}->set_width ($self->{children}[0]{w}); 2352 $self->{layout}->set_width ($self->{children}[0]{w});
2211 2353
2212 $self->reflow; 2354 $self->reflow;
2213} 2355}
2214 2356
2357sub text_size {
2358 my ($self, $text, $indent) = @_;
2359
2360 my $layout = $self->{layout};
2361
2362 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2363 $layout->set_width ($self->{children}[0]{w} - $indent);
2364 $layout->set_markup ($text);
2365
2366 $layout->size
2367}
2368
2369sub reflow {
2370 my ($self) = @_;
2371
2372 $self->{need_reflow}++;
2373 $self->update;
2374}
2375
2376sub set_offset {
2377 my ($self, $offset) = @_;
2378
2379 # todo: base offset on lines or so, not on pixels
2380 $self->{children}[1]->set_value ($offset);
2381}
2382
2383sub clear {
2384 my ($self) = @_;
2385
2386 $self->{par} = [];
2387 $self->{height} = 0;
2388 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2389}
2390
2215sub add_paragraph { 2391sub add_paragraph {
2216 my ($self, $color, $text) = @_; 2392 my ($self, $color, $text, $indent) = @_;
2217 2393
2218 #TODO: intelligently "reformat" paragraph 2394 for my $line (split /\n/, $text) {
2219 2395 my ($w, $h) = $self->text_size ($line);
2220 my $height = $self->text_height ($text);
2221
2222 $self->{height} += $height; 2396 $self->{height} += $h;
2397 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2398 }
2223 2399
2224 push @{$self->{par}}, [$height, $color, $text];
2225
2226 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2400 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2227 $self->{children}[1]->update;
2228} 2401}
2229 2402
2230sub update { 2403sub update {
2231 my ($self) = @_; 2404 my ($self) = @_;
2232 2405
… …
2234 2407
2235 return unless $self->{h} > 0; 2408 return unless $self->{h} > 0;
2236 2409
2237 delete $self->{texture}; 2410 delete $self->{texture};
2238 2411
2239 $ROOT->on_refresh ($self, sub { 2412 $ROOT->on_post_alloc ($self, sub {
2413 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2414
2240 if (delete $self->{need_reflow}) { 2415 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2416 my $height = 0;
2242 2417
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2418 my $layout = $self->{layout};
2419
2420 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2421
2244 for @{$self->{par}}; 2422 for (@{$self->{par}}) {
2423 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2424 $layout->set_width ($W - $_->[3]);
2425 $layout->set_markup ($_->[4]);
2426 my ($w, $h) = $layout->size;
2427 $_->[0] = $w + $_->[3];
2428 $_->[1] = $h;
2429 }
2430
2431 $height += $_->[1];
2432 }
2245 2433
2246 $self->{height} = $height; 2434 $self->{height} = $height;
2247 2435
2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2436 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2249 2437
2250 delete $self->{texture}; 2438 delete $self->{texture};
2251 } 2439 }
2252 2440
2253 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2441 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2254 glClearColor 0, 0, 0, 0; 2442 glClearColor 0.5, 0.5, 0.5, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2443 glClear GL_COLOR_BUFFER_BIT;
2256 2444
2445 my $top = int $self->{children}[1]{range}[0];
2446
2447 my $y0 = $top;
2448 my $y1 = $top + $H;
2449
2450 my $y = 0;
2451
2452 my $layout = $self->{layout};
2453
2454 $layout->set_font ($self->{font}) if $self->{font};
2455
2257 glEnable GL_BLEND; 2456 glEnable GL_BLEND;
2457 #TODO# not correct in windows where rgba is forced off
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2458 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 2459
2273 for my $par (@{$self->{par}}) { 2460 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2461 my $h = $par->[1];
2275 2462
2276 if ($y0 < $y + $h && $y < $y1) { 2463 if ($y0 < $y + $h && $y < $y1) {
2464 $layout->set_foreground (@{ $par->[2] });
2465 $layout->set_width ($W - $par->[3]);
2277 $layout->set_text ($par->[2]); 2466 $layout->set_markup ($par->[4]);
2278 2467
2279 glColor @{ $par->[1] }; 2468 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 my ($W, $H) = $layout->size; 2469
2281 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2470 glRasterPos $par->[3], $y - $y0;
2471 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282 } 2472 }
2283 2473
2284 $y += $h; 2474 $y += $h;
2285 } 2475 }
2286 2476
2287 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND; 2477 glDisable GL_BLEND;
2289 }; 2478 };
2290 }); 2479 });
2291} 2480}
2292 2481
2293sub _draw { 2482sub _draw {
2294 my ($self) = @_; 2483 my ($self) = @_;
2295 2484
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2485 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2487 glColor 1, 1, 1, 1;
2301 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2488 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2302 glDisable GL_TEXTURE_2D; 2489 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2490
2305 $self->{children}[1]->draw; 2491 $self->{children}[1]->draw;
2306 2492
2307} 2493}
2308 2494
… …
2376 2562
2377 # TODO: use animation 2563 # TODO: use animation
2378 if ($self->{state} = !$self->{state}) { 2564 if ($self->{state} = !$self->{state}) {
2379 $CFClient::UI::ROOT->add ($self->{other}); 2565 $CFClient::UI::ROOT->add ($self->{other});
2380 $self->{other}->move ($self->coord2global (0, $self->{h})); 2566 $self->{other}->move ($self->coord2global (0, $self->{h}));
2381 $self->emit ("open"); 2567 $self->_emit ("open");
2382 } else { 2568 } else {
2383 $CFClient::UI::ROOT->remove ($self->{other}); 2569 $CFClient::UI::ROOT->remove ($self->{other});
2384 $self->emit ("close"); 2570 $self->_emit ("close");
2385 } 2571 }
2386 2572
2387 $self->emit (changed => $self->{state}); 2573 $self->_emit (changed => $self->{state});
2388} 2574}
2389 2575
2390############################################################################# 2576#############################################################################
2391 2577
2392package CFClient::UI::Tooltip; 2578package CFClient::UI::Tooltip;
… …
2402 @_, 2588 @_,
2403 can_events => 0, 2589 can_events => 0,
2404 ) 2590 )
2405} 2591}
2406 2592
2407sub set_markup { 2593sub set_tooltip_from {
2408 my ($self, $text) = @_; 2594 my ($self, $widget) = @_;
2409 2595
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2596 $self->add (new CFClient::UI::Label
2411 $self->{label}->set_markup ($text); 2597 markup => $widget->{tooltip},
2412 $self->add ($self->{label}); 2598 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2599 fontsize => 0.8,
2600 fg => [0, 0, 0, 1],
2601 ellipsise => 0,
2602 font => ($widget->{tooltip_font} || $::FONT_PROP),
2603 );
2413} 2604}
2414 2605
2415sub size_request { 2606sub size_request {
2416 my ($self) = @_; 2607 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2608
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2609 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2610
2422 ($w + 4, $h + 4) 2611 ($w + 4, $h + 4)
2423} 2612}
… …
2429} 2618}
2430 2619
2431sub _draw { 2620sub _draw {
2432 my ($self) = @_; 2621 my ($self) = @_;
2433 2622
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2623 glTranslate 0.375, 0.375;
2436 2624
2437 my ($w, $h) = @$self{qw(w h)}; 2625 my ($w, $h) = @$self{qw(w h)};
2438 2626
2439 glColor 1, 0.8, 0.4; 2627 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2638 glVertex 0 , $h;
2451 glVertex $w, $h; 2639 glVertex $w, $h;
2452 glVertex $w, 0; 2640 glVertex $w, 0;
2453 glEnd; 2641 glEnd;
2454 2642
2455 glPopMatrix; 2643 glTranslate 2 - 0.375, 2 - 0.375;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2644 $self->SUPER::_draw;
2459} 2645}
2460 2646
2461############################################################################# 2647#############################################################################
2462 2648
… …
2467use CFClient::OpenGL; 2653use CFClient::OpenGL;
2468 2654
2469sub new { 2655sub new {
2470 my $class = shift; 2656 my $class = shift;
2471 2657
2472 $class->SUPER::new ( 2658 my $self = $class->SUPER::new (
2473 aspect => 1, 2659 aspect => 1,
2660 can_events => 0,
2474 @_, 2661 @_,
2475 ) 2662 );
2663
2664 if ($self->{anim} && $self->{animspeed}) {
2665 Scalar::Util::weaken (my $widget = $self);
2666
2667 $self->{timer} = Event->timer (
2668 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2669 hard => 1,
2670 interval => $self->{animspeed},
2671 cb => sub {
2672 ++$widget->{frame};
2673 $widget->update;
2674 },
2675 );
2676 }
2677
2678 $self
2476} 2679}
2477 2680
2478sub size_request { 2681sub size_request {
2479 (32, 8) 2682 (32, 8)
2480} 2683}
2481 2684
2685sub update {
2686 my ($self) = @_;
2687
2688 return unless $self->{visible};
2689
2690 $self->SUPER::update;
2691}
2692
2482sub _draw { 2693sub _draw {
2483 my ($self) = @_; 2694 my ($self) = @_;
2484 2695
2485 return unless $::CONN;#d# manage and cache textures differently 2696 return unless $::CONN;
2697
2698 my $face;
2699
2700 if ($self->{frame}) {
2701 my $anim = $::CONN->{anim}[$self->{anim}];
2702
2703 $face = $anim->[ $self->{frame} % @$anim ]
2704 if $anim && @$anim;
2705 }
2706
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2707 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487 2708
2488 # TODO animation
2489 if ($tex) { 2709 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2710 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2712 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2713 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2714 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2715 }
2716}
2717
2718sub DESTROY {
2719 my ($self) = @_;
2720
2721 $self->{timer}->cancel
2722 if $self->{timer};
2723
2724 $self->SUPER::DESTROY;
2499} 2725}
2500 2726
2501############################################################################# 2727#############################################################################
2502 2728
2503package CFClient::UI::InventoryItem; 2729package CFClient::UI::Inventory;
2504 2730
2505our @ISA = CFClient::UI::HBox::; 2731our @ISA = CFClient::UI::ScrolledWindow::;
2506 2732
2507sub new { 2733sub new {
2508 my $class = shift; 2734 my $class = shift;
2509 2735
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 ( 2736 my $self = $class->SUPER::new (
2520 can_hover => 1, 2737 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 @_, 2738 @_,
2575 ); 2739 );
2576 2740
2577 $self 2741 $self
2578} 2742}
… …
2581 my ($self, $items) = @_; 2745 my ($self, $items) = @_;
2582 2746
2583 $self->{scrolled}->clear; 2747 $self->{scrolled}->clear;
2584 return unless $items; 2748 return unless $items;
2585 2749
2586 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2750 my @items = sort {
2751 ($a->{type} <=> $b->{type})
2752 or ($a->{name} cmp $b->{name})
2753 } @$items;
2587 2754
2588 $self->{real_items} = \@items; 2755 $self->{real_items} = \@items;
2589 2756
2757 my $row = 0;
2590 for my $item (@items) { 2758 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2 2759 CFClient::Item::update_widgets $item;
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594 2760
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2761 $self->{scrolled}->add (0, $row, $item->{face_widget});
2596 } 2762 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2763 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2597 2764
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2765 $row++;
2766 }
2599} 2767}
2600 2768
2601sub size_request { 2769sub size_request {
2602 my ($self) = @_; 2770 my ($self) = @_;
2603 ($self->{req_w}, $self->{req_h}); 2771 ($self->{req_w}, $self->{req_h});
… …
2643 2811
2644# popup given the event (must be a mouse button down event currently) 2812# popup given the event (must be a mouse button down event currently)
2645sub popup { 2813sub popup {
2646 my ($self, $ev) = @_; 2814 my ($self, $ev) = @_;
2647 2815
2648 $self->emit ("popdown"); 2816 $self->_emit ("popdown");
2649 2817
2650 # maybe save $GRAB? must be careful about events... 2818 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self; 2819 $GRAB = $self;
2652 $self->{button} = $ev->{button}; 2820 $self->{button} = $ev->{button};
2653 2821
… …
2668 2836
2669 if ($ev->{button} == $self->{button}) { 2837 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB; 2838 undef $GRAB;
2671 $self->hide; 2839 $self->hide;
2672 2840
2673 $self->emit ("popdown"); 2841 $self->_emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover}; 2842 $self->{hover}[1]->() if $self->{hover};
2675 } 2843 }
2676} 2844}
2677 2845
2678############################################################################# 2846#############################################################################
2679 2847
2848package CFClient::UI::Statusbox;
2849
2850our @ISA = CFClient::UI::VBox::;
2851
2852sub new {
2853 my $class = shift;
2854
2855 $class->SUPER::new (
2856 fontsize => 0.8,
2857 @_,
2858 )
2859}
2860
2861sub reorder {
2862 my ($self) = @_;
2863 my $NOW = time;
2864
2865 while (my ($k, $v) = each %{ $self->{item} }) {
2866 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2867 }
2868
2869 my @widgets;
2870
2871 my @items = sort {
2872 $a->{pri} <=> $b->{pri}
2873 or $b->{id} <=> $a->{id}
2874 } values %{ $self->{item} };
2875
2876 my $count = 10 + 1;
2877 for my $item (@items) {
2878 last unless --$count;
2879
2880 push @widgets, $item->{label} ||= do {
2881 # TODO: doesn't handle markup well (read as: at all)
2882 my $short = $item->{count} > 1
2883 ? "<b>$item->{count} ×</b> $item->{text}"
2884 : $item->{text};
2885
2886 for ($short) {
2887 s/^\s+//;
2888 s/\s+/ /g;
2889 }
2890
2891 new CFClient::UI::Label
2892 markup => $short,
2893 tooltip => $item->{tooltip},
2894 tooltip_font => $::FONT_PROP,
2895 tooltip_width => 0.67,
2896 fontsize => $item->{fontsize} || $self->{fontsize},
2897 max_w => $::WIDTH * 0.44,
2898 fg => $item->{fg},
2899 can_events => 1,
2900 can_hover => 1
2901 };
2902 }
2903
2904 $self->clear;
2905 $self->SUPER::add (reverse @widgets);
2906}
2907
2908sub add {
2909 my ($self, $text, %arg) = @_;
2910
2911 $text =~ s/^\s+//;
2912 $text =~ s/\s+$//;
2913
2914 return unless $text;
2915
2916 my $timeout = time + ((delete $arg{timeout}) || 60);
2917
2918 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2919
2920 if (my $item = $self->{item}{$group}) {
2921 if ($item->{text} eq $text) {
2922 $item->{count}++;
2923 } else {
2924 $item->{count} = 1;
2925 $item->{text} = $item->{tooltip} = $text;
2926 }
2927 $item->{id} = ++$self->{id};
2928 $item->{timeout} = $timeout;
2929 delete $item->{label};
2930 } else {
2931 $self->{item}{$group} = {
2932 id => ++$self->{id},
2933 text => $text,
2934 timeout => $timeout,
2935 tooltip => $text,
2936 fg => [0.8, 0.8, 0.8, 0.8],
2937 pri => 0,
2938 count => 1,
2939 %arg,
2940 };
2941 }
2942
2943 $self->reorder;
2944}
2945
2946sub reconfigure {
2947 my ($self) = @_;
2948
2949 delete $_->{label}
2950 for values %{ $self->{item} || {} };
2951
2952 $self->reorder;
2953 $self->SUPER::reconfigure;
2954}
2955
2956#############################################################################
2957
2680package CFClient::UI::Root; 2958package CFClient::UI::Root;
2681 2959
2682our @ISA = CFClient::UI::Container::; 2960our @ISA = CFClient::UI::Container::;
2683 2961
2684use CFClient::OpenGL; 2962use CFClient::OpenGL;
2685 2963
2964sub new {
2965 my $class = shift;
2966
2967 $class->SUPER::new (
2968 @_,
2969 )
2970}
2971
2972sub configure {
2973 my ($self, $x, $y, $w, $h) = @_;
2974
2975 $self->{w} = $w;
2976 $self->{h} = $h;
2977}
2978
2686sub check_size { 2979sub check_size {
2687 my ($self) = @_; 2980 my ($self) = @_;
2688 2981
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 2982 $self->size_allocate ($self->{w}, $self->{h})
2983 if $self->{w};
2690} 2984}
2691 2985
2692sub size_request { 2986sub size_request {
2693 my ($self) = @_; 2987 my ($self) = @_;
2694 2988
… …
2696} 2990}
2697 2991
2698sub size_allocate { 2992sub size_allocate {
2699 my ($self, $w, $h) = @_; 2993 my ($self, $w, $h) = @_;
2700 2994
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->{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) { 2995 for my $child ($self->children) {
2727 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2996 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2728 2997
2998 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2999 if exists $child->{req_x};
3000
3001 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3002 if exists $child->{req_y};
3003
2729 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3004 $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; 3005 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3006
2731 $child->configure ($X, $Y, $W, $H); 3007 $child->configure ($X, $Y, $W, $H);
2732 } 3008 }
2733} 3009}
2734 3010
2735sub _topleft { 3011sub coord2local {
2736 my ($self, $x, $y) = @_; 3012 my ($self, $x, $y) = @_;
2737 3013
2738 ($x, $y) 3014 ($x, $y)
2739} 3015}
2740 3016
3017sub coord2global {
3018 my ($self, $x, $y) = @_;
3019
3020 ($x, $y)
3021}
3022
2741sub update { 3023sub update {
2742 my ($self) = @_; 3024 my ($self) = @_;
2743 3025
2744 $self->check_size; 3026 $self->check_size;
2745 ::refresh (); 3027 $::WANT_REFRESH++;
2746} 3028}
2747 3029
2748sub add { 3030sub add {
2749 my ($self, $child) = @_; 3031 my ($self, @children) = @_;
2750 3032
3033 for (my @widgets = @children; my $w = pop @widgets; ) {
3034 push @widgets, $w->children;
3035 $w->{root} = $self;
3036 $w->{visible} = 1;
3037 }
3038
3039 for my $child (@children) {
3040 $child->{is_toplevel} = 1;
3041
2751 # integerize window positions 3042 # integerise window positions
2752 $child->{x} = int $child->{x}; 3043 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y}; 3044 $child->{y} = int $child->{y};
3045 }
2754 3046
2755 $self->SUPER::add ($child); 3047 $self->SUPER::add (@children);
3048}
3049
3050sub remove {
3051 my ($self, @children) = @_;
3052
3053 $self->SUPER::remove (@children);
3054
3055 while (@children) {
3056 my $w = pop @children;
3057 push @children, $w->children;
3058 $w->set_invisible;
3059 }
2756} 3060}
2757 3061
2758sub on_refresh { 3062sub on_refresh {
2759 my ($self, $id, $cb) = @_; 3063 my ($self, $id, $cb) = @_;
2760 3064
2761 $self->{refresh_hook}{$id} = $cb; 3065 $self->{refresh_hook}{$id} = $cb;
2762} 3066}
2763 3067
3068sub on_post_alloc {
3069 my ($self, $id, $cb) = @_;
3070
3071 $self->{post_alloc_hook}{$id} = $cb;
3072}
3073
2764sub draw { 3074sub draw {
2765 my ($self) = @_; 3075 my ($self) = @_;
2766 3076
2767 while (my $rcb = delete $self->{refresh_hook}) { 3077 while ($self->{refresh_hook}) {
2768 $_->() for values %$rcb; 3078 $_->()
3079 for values %{delete $self->{refresh_hook}};
3080 }
3081
3082 if ($self->{check_size}) {
3083 my @queue = ([], []);
3084
3085 for (;;) {
3086 if ($self->{check_size}) {
3087 # heuristic: check containers last
3088 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3089 for values %{delete $self->{check_size}}
3090 }
3091
3092 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3093
3094 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3095 ? @$widget{qw(user_w user_h)}
3096 : $widget->size_request;
3097
3098 if (delete $widget->{force_alloc}
3099 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3100 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3101
3102 $widget->{req_w} = $w;
3103 $widget->{req_h} = $h;
3104
3105 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3106
3107 $widget->{parent}->check_size
3108 if $widget->{parent};
3109 }
3110 }
3111 }
3112
3113 while ($self->{size_alloc}) {
3114 for (values %{delete $self->{size_alloc}}) {
3115 my ($widget, $w, $h) = @$_;
3116
3117 $w = 0 if $w < 0;
3118 $h = 0 if $h < 0;
3119
3120 $widget->{w} = $w;
3121 $widget->{h} = $h;
3122 $widget->emit (size_allocate => $w, $h);
3123 }
3124 }
3125
3126 while ($self->{post_alloc_hook}) {
3127 $_->()
3128 for values %{delete $self->{post_alloc_hook}};
2769 } 3129 }
2770 3130
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3131 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3132 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3133 glClear GL_COLOR_BUFFER_BIT;
2774 3134
2775 glMatrixMode GL_PROJECTION; 3135 glMatrixMode GL_PROJECTION;
2776 glLoadIdentity; 3136 glLoadIdentity;
2777 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3137 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778 glMatrixMode GL_MODELVIEW; 3138 glMatrixMode GL_MODELVIEW;
2779 glLoadIdentity; 3139 glLoadIdentity;
2780 3140
2781 $self->_draw; 3141 $self->_draw;
2782} 3142}
… …
2784############################################################################# 3144#############################################################################
2785 3145
2786package CFClient::UI; 3146package CFClient::UI;
2787 3147
2788$ROOT = new CFClient::UI::Root; 3148$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip; 3149$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790 3150
27911 31511
2792 3152

Diff Legend

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