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.188 by root, Mon May 8 21:16:09 2006 UTC vs.
Revision 1.241 by root, Fri May 26 20:50:35 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
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
12our $ROOT; 14our $ROOT;
13our $TOOLTIP; 15our $TOOLTIP;
14our $BUTTON_STATE; 16our $BUTTON_STATE;
17
18our %WIDGET; # all widgets, weak-referenced
15 19
16sub check_tooltip { 20sub check_tooltip {
17 if (!$GRAB) { 21 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 23 if (length $widget->{tooltip}) {
… …
23 27
24 my $tip = $widget->{tooltip}; 28 my $tip = $widget->{tooltip};
25 29
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 30 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 31
28 $TOOLTIP->set_markup ($widget->{tooltip}); 32 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 33 $TOOLTIP->show;
31 34
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 36
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 38 if $x + $TOOLTIP->{w} > $::WIDTH;
37 39
38 $TOOLTIP->move ($x, $y); 40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
39 } 43 }
40 44
41 return; 45 return;
42 } 46 }
43 } 47 }
… …
47 delete $TOOLTIP->{owner}; 51 delete $TOOLTIP->{owner};
48} 52}
49 53
50# class methods for events 54# class methods for events
51sub feed_sdl_key_down_event { 55sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 56 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 57 if $FOCUS;
54} 58}
55 59
56sub feed_sdl_key_up_event { 60sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 61 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 62 if $FOCUS;
59} 63}
60 64
61sub feed_sdl_button_down_event { 65sub feed_sdl_button_down_event {
62 my ($ev) = @_; 66 my ($ev) = @_;
… …
71 check_tooltip; 75 check_tooltip;
72 } 76 }
73 77
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 78 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 79
76 if ($GRAB) { 80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 81 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 82}
81 83
82sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
83 my ($ev) = @_; 85 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
85 87
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 89
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 91
90 if ($GRAB) { 92 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 93 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 94
95 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 97 $grab->update if $grab;
98 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 115
116 check_tooltip; 116 check_tooltip;
117 } 117 }
118 118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 120 if $HOVER;
123} 121}
124 122
125# convert position array to integers 123# convert position array to integers
126sub harmonize { 124sub harmonize {
127 my ($vals) = @_; 125 my ($vals) = @_;
… …
131 for (@$vals) { 129 for (@$vals) {
132 my $i = int $_ + $rem; 130 my $i = int $_ + $rem;
133 $rem += $_ - $i; 131 $rem += $_ - $i;
134 $_ = $i; 132 $_ = $i;
135 } 133 }
134}
135
136sub full_refresh {
137 # make a copy, otherwise for complains about freed values.
138 my @widgets = values %WIDGET;
139
140 $_->update
141 for @widgets;
142}
143
144sub reconfigure_widgets {
145 # make a copy, otherwise C<for> complains about freed values.
146 my @widgets = values %WIDGET;
147
148 $_->reconfigure
149 for @widgets;
150}
151
152# call when resolution changes etc.
153sub rescale_widgets {
154 my ($sx, $sy) = @_;
155
156 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167 }
168
169 reconfigure_widgets;
136} 170}
137 171
138############################################################################# 172#############################################################################
139 173
140package CFClient::UI::Base; 174package CFClient::UI::Base;
… …
158 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
160 } 194 }
161 } 195 }
162 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
163 $self 199 $self
164} 200}
165 201
166sub destroy { 202sub destroy {
167 my ($self) = @_; 203 my ($self) = @_;
… …
170 %$self = (); 206 %$self = ();
171} 207}
172 208
173sub show { 209sub show {
174 my ($self) = @_; 210 my ($self) = @_;
175
176 return if $self->{parent}; 211 return if $self->{parent};
177 212
178 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
179} 214}
180 215
181sub hide { 216sub show_centered {
182 my ($self) = @_; 217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228
229sub set_invisible {
230 my ($self) = @_;
231
232 # broken show/hide model
233
234 delete $self->{root};
235 delete $self->{visible};
183 236
184 undef $GRAB if $GRAB == $self; 237 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 238 undef $HOVER if $HOVER == $self;
239
240 CFClient::UI::check_tooltip
241 if $CFClient::UI::TOOLTIP->{owner} == $self;
242
243 $self->focus_out;
244}
245
246sub hide {
247 my ($self) = @_;
248
249 $self->set_invisible;
186 250
187 $self->{parent}->remove ($self) 251 $self->{parent}->remove ($self)
188 if $self->{parent}; 252 if $self->{parent};
189} 253}
190 254
… …
232 $self->{y} = $y; 296 $self->{y} = $y;
233 $self->update; 297 $self->update;
234 } 298 }
235 299
236 if ($self->{w} != $w || $self->{h} != $h) { 300 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 301 $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 } 302 }
244} 303}
245 304
246sub size_allocate { 305sub size_allocate {
247 # nothing to be done 306 # nothing to be done
248} 307}
249 308
309sub reconfigure {
310 my ($self) = @_;
311
312 $self->check_size (1);
313 $self->update;
314}
315
250sub children { 316sub 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} 317}
264 318
265sub set_max_size { 319sub set_max_size {
266 my ($self, $w, $h) = @_; 320 my ($self, $w, $h) = @_;
267 321
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 322 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 323 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 324}
271 325
272# return top left coordinates 326sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 327 my ($self, $tooltip) = @_;
275 328
276 $self->{parent} 329 $tooltip =~ s/^\s+//;
277 or Carp::confess "no parent widget in _topleft\n";#d# 330 $tooltip =~ s/\s+$//;
278 331
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 332 return if $self->{tooltip} eq $tooltip;
333
334 $self->{tooltip} = $tooltip;
335
336 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
337 delete $CFClient::UI::TOOLTIP->{owner};
338 CFClient::UI::check_tooltip;
339 }
280} 340}
281 341
282# translate global coordinates to local coordinate system 342# translate global coordinates to local coordinate system
283sub coord2local { 343sub coord2local {
284 my ($self, $x, $y) = @_; 344 my ($self, $x, $y) = @_;
285 345
286 my ($X, $Y) = $self->_topleft; 346 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 347}
289 348
290# translate local coordinates to global coordinate system 349# translate local coordinates to global coordinate system
291sub coord2global { 350sub coord2global {
292 my ($self, $x, $y) = @_; 351 my ($self, $x, $y) = @_;
293 352
294 my ($X, $Y) = $self->_topleft; 353 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 354}
297 355
298sub focus_in { 356sub focus_in {
299 my ($self) = @_; 357 my ($self) = @_;
300 358
301 return if $FOCUS == $self; 359 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 360 return unless $self->{can_focus};
303 361
304 my $focus = $FOCUS; $FOCUS = $self; 362 my $focus = $FOCUS; $FOCUS = $self;
305 363
306 $self->emit (focus_in => $focus); 364 $self->_emit (focus_in => $focus);
307 365
308 $focus->update if $focus; 366 $focus->update if $focus;
309 $FOCUS->update; 367 $FOCUS->update;
310} 368}
311 369
… …
314 372
315 return unless $FOCUS == $self; 373 return unless $FOCUS == $self;
316 374
317 my $focus = $FOCUS; undef $FOCUS; 375 my $focus = $FOCUS; undef $FOCUS;
318 376
319 $self->emit (focus_out => $focus); 377 $self->_emit (focus_out => $focus);
320 378
321 $focus->update if $focus; #? 379 $focus->update if $focus; #?
380
381 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
382 unless $FOCUS;
322} 383}
323 384
324sub mouse_motion { } 385sub mouse_motion { }
325sub button_up { } 386sub button_up { }
326sub key_down { } 387sub key_down { }
327sub key_up { } 388sub key_up { }
328 389
329sub button_down { 390sub button_down {
330 my ($self, $ev, $x, $y) = @_; 391 my ($self, $ev, $x, $y) = @_;
331 392
332 $self->focus_in; 393 $self->focus_in;
… …
366 if ($ENV{PCLIENT_DEBUG}) { 427 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix; 428 glPushMatrix;
368 glColor 1, 1, 0, 1; 429 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP; 431 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 432 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 433 glVertex $self->{w} - 1, 0;
373 glVertex $self->{w}, $self->{h}; 434 glVertex $self->{w} - 1, $self->{h} - 1;
374 glVertex 0 , $self->{h}; 435 glVertex 0 , $self->{h} - 1;
375 glEnd; 436 glEnd;
376 glPopMatrix; 437 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 438 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 439 }
379} 440}
380 441
381sub _draw { 442sub _draw {
382 my ($self) = @_; 443 my ($self) = @_;
… …
398 459
399sub set_parent { 460sub set_parent {
400 my ($self, $parent) = @_; 461 my ($self, $parent) = @_;
401 462
402 Scalar::Util::weaken ($self->{parent} = $parent); 463 Scalar::Util::weaken ($self->{parent} = $parent);
464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
468 # TODO: req_w _does_change after ->reconfigure
469 $self->check_size
470 unless exists $self->{req_w};
471
472 $self->show;
403} 473}
404 474
405sub check_size { 475sub check_size {
406 my ($self) = @_; 476 my ($self, $forced) = @_;
407 477
408 $self->{parent} 478 $self->{force_alloc} = 1 if $forced;
409 or return 1; 479 $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} 480}
430 481
431sub update { 482sub update {
432 my ($self) = @_; 483 my ($self) = @_;
433 484
… …
439 my ($self, $signal, $cb) = @_; 490 my ($self, $signal, $cb) = @_;
440 491
441 push @{ $self->{signal_cb}{$signal} }, $cb; 492 push @{ $self->{signal_cb}{$signal} }, $cb;
442} 493}
443 494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
444sub emit { 501sub emit {
445 my ($self, $signal, @args) = @_; 502 my ($self, $signal, @args) = @_;
446 503
447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
448} 506}
449 507
450sub DESTROY { 508sub DESTROY {
451 my ($self) = @_; 509 my ($self) = @_;
452 510
511 delete $WIDGET{$self+0};
453 #$self->deactivate; 512 #$self->deactivate;
454} 513}
455 514
456############################################################################# 515#############################################################################
457 516
… …
466 my $class = shift; 525 my $class = shift;
467 526
468 # range [value, low, high, page] 527 # range [value, low, high, page]
469 528
470 $class->SUPER::new ( 529 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 530 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 531 #active_bg => [1, 1, 1, 0.5],
473 @_ 532 @_
474 ) 533 )
475} 534}
476 535
477sub _draw { 536sub _draw {
478 my ($self) = @_; 537 my ($self) = @_;
479 538
539 my $color = $FOCUS == $self && $self->{active_bg}
540 ? $self->{active_bg}
541 : $self->{bg};
542
543 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 544 my ($w, $h) = @$self{qw(w h)};
481 545
482 glEnable GL_BLEND; 546 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 547 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 548 glColor @$color;
485 549
486 glBegin GL_QUADS; 550 glBegin GL_QUADS;
487 glVertex 0 , 0; 551 glVertex 0 , 0;
488 glVertex 0 , $h; 552 glVertex 0 , $h;
489 glVertex $w, $h; 553 glVertex $w, $h;
490 glVertex $w, 0; 554 glVertex $w, 0;
491 glEnd; 555 glEnd;
492 556
493 glDisable GL_BLEND; 557 glDisable GL_BLEND;
558 }
494} 559}
495 560
496############################################################################# 561#############################################################################
497 562
498package CFClient::UI::Empty; 563package CFClient::UI::Empty;
… …
542 $self->{children} = [ 607 $self->{children} = [
543 sort { $a->{z} <=> $b->{z} } 608 sort { $a->{z} <=> $b->{z} }
544 @{$self->{children}}, @widgets 609 @{$self->{children}}, @widgets
545 ]; 610 ];
546 611
547 $_->check_size 612 $self->check_size (1);
548 for @widgets;
549
550 $self->update; 613 $self->update;
551} 614}
552 615
553sub children { 616sub children {
554 @{ $_[0]{children} } 617 @{ $_[0]{children} }
… …
560 delete $child->{parent}; 623 delete $child->{parent};
561 $child->hide; 624 $child->hide;
562 625
563 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
564 627
565 $self->check_size; 628 $self->check_size (1);
566 $self->update; 629 $self->update;
567} 630}
568 631
569sub clear { 632sub clear {
570 my ($self) = @_; 633 my ($self) = @_;
… …
661} 724}
662 725
663sub update { 726sub update {
664 my ($self) = @_; 727 my ($self) = @_;
665 728
666 $ROOT->on_refresh ($self => sub { $self->render_child }); 729 $ROOT->on_post_alloc ($self => sub { $self->render_child });
667 $self->SUPER::update; 730 $self->SUPER::update;
668} 731}
669 732
670sub size_allocate { 733sub size_allocate {
671 my ($self, $w, $h) = @_; 734 my ($self, $w, $h) = @_;
… …
684 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 747 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
685 glClearColor 0, 0, 0, 0; 748 glClearColor 0, 0, 0, 0;
686 glClear GL_COLOR_BUFFER_BIT; 749 glClear GL_COLOR_BUFFER_BIT;
687 750
688 $self->_render; 751 $self->_render;
689# glColorMask 1, 1, 1, 0;
690# glEnable GL_BLEND;
691# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
692# glRasterPos 0, 0;
693# glCopyPixels 0, 0, $self->{w}, $self->{h};
694# glDisable GL_BLEND;
695# glColorMask 1, 1, 1, 1;
696 }; 752 };
697} 753}
698 754
699sub _draw { 755sub _draw {
700 my ($self) = @_; 756 my ($self) = @_;
… …
702 my ($w, $h) = ($self->w, $self->h); 758 my ($w, $h) = ($self->w, $self->h);
703 759
704 my $tex = $self->{texture} 760 my $tex = $self->{texture}
705 or return; 761 or return;
706 762
707 glEnable GL_BLEND;
708 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
709 glEnable GL_TEXTURE_2D; 763 glEnable GL_TEXTURE_2D;
710 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 764 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711 glColor 0, 0, 0, 1; 765 glColor 1, 1, 1, 1;
712 766
713 $tex->draw_quad (0, 0, $w, $h); 767 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
714 768
715 glDisable GL_BLEND;
716 glDisable GL_TEXTURE_2D; 769 glDisable GL_TEXTURE_2D;
717} 770}
718 771
719############################################################################# 772#############################################################################
720 773
721package CFClient::UI::ViewPort; 774package CFClient::UI::ViewPort;
722 775
723our @ISA = CFClient::UI::Window::; 776our @ISA = CFClient::UI::Window::;
724 777
778sub new {
779 my $class = shift;
780
781 $class->SUPER::new (
782 scroll_x => 0,
783 scroll_y => 1,
784 @_,
785 )
786}
787
725sub size_request { 788sub size_request {
726 my ($self) = @_; 789 my ($self) = @_;
727 790
728 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
729 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
730 792
731 @$self{qw(child_w child_h)} 793 @$self{qw(child_w child_h)}
732} 794}
733 795
734sub size_allocate { 796sub size_allocate {
735 my ($self, $w, $h) = @_; 797 my ($self, $w, $h) = @_;
736 798
799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
801
802 $self->child->configure (0, 0, $w, $h);
737 $self->update; 803 $self->update;
738} 804}
739 805
740sub set_offset { 806sub set_offset {
741 my ($self, $x, $y) = @_; 807 my ($self, $x, $y) = @_;
… …
744 $self->{view_y} = int $y; 810 $self->{view_y} = int $y;
745 811
746 $self->update; 812 $self->update;
747} 813}
748 814
749# hmm, this does not work for topleft of $self... but we should not aks for that 815# hmm, this does not work for topleft of $self... but we should not ask for that
750sub _topleft { 816sub coord2local {
751 my ($self, $x, $y) = @_; 817 my ($self, $x, $y) = @_;
752 818
753 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 819 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
820}
821
822sub coord2global {
823 my ($self, $x, $y) = @_;
824
825 $x = List::Util::min $self->{w}, $x - $self->{view_x};
826 $y = List::Util::min $self->{h}, $y - $self->{view_y};
827
828 $self->SUPER::coord2global ($x, $y)
754} 829}
755 830
756sub find_widget { 831sub find_widget {
757 my ($self, $x, $y) = @_; 832 my ($self, $x, $y) = @_;
758 833
… …
786 861
787 my $slider = new CFClient::UI::Slider 862 my $slider = new CFClient::UI::Slider
788 vertical => 1, 863 vertical => 1,
789 range => [0, 0, 1, 0.01], # HACK fix 864 range => [0, 0, 1, 0.01], # HACK fix
790 connect_changed => sub { 865 connect_changed => sub {
791 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 866 $self->{vp}->set_offset (0, $_[1]);
792 }, 867 },
793 ; 868 ;
794 869
795 $self = $class->SUPER::new ( 870 $self = $class->SUPER::new (
796 vp => (new CFClient::UI::ViewPort), 871 vp => (new CFClient::UI::ViewPort expand => 1),
797 slider => $slider, 872 slider => $slider,
798 @_, 873 @_,
799 ); 874 );
800 875
801 $self->{vp}->add ($self->{scrolled}); 876 $self->{vp}->add ($self->{scrolled});
… …
803 $self->add ($self->{slider}); 878 $self->add ($self->{slider});
804 879
805 $self 880 $self
806} 881}
807 882
883sub update {
884 my ($self) = @_;
885
886 $self->SUPER::update;
887
888 # todo: overwrite size_allocate of child
889 my $child = $self->{vp}->child;
890 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
891}
892
893sub size_allocate {
894 my ($self, $w, $h) = @_;
895
896 $self->SUPER::size_allocate ($w, $h);
897
898 my $child = $self->{vp}->child;
899 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
900}
901
808#TODO# update range on size_allocate depeneing on child 902#TODO# update range on size_allocate depending on child
809# update viewport offset on scroll 903# update viewport offset on scroll
810 904
811############################################################################# 905#############################################################################
812 906
813package CFClient::UI::Frame; 907package CFClient::UI::Frame;
… …
817use CFClient::OpenGL; 911use CFClient::OpenGL;
818 912
819sub new { 913sub new {
820 my $class = shift; 914 my $class = shift;
821 915
822 my $self = $class->SUPER::new ( 916 $class->SUPER::new (
823 bg => [1, 1, 1, 1], 917 bg => undef,
824 border_bg => [1, 1, 1, 1],
825 border => 0.8,
826 @_ 918 @_,
827 ); 919 )
828
829 $self
830} 920}
831 921
832sub _draw { 922sub _draw {
833 my ($self) = @_; 923 my ($self) = @_;
834 924
835 my ($w, $h) = ($self->{w}, $self->{h}); 925 if ($self->{bg}) {
926 my ($w, $h) = @$self{qw(w h)};
836 927
837 glEnable GL_BLEND; 928 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 929 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D; 930 glColor @{ $self->{bg} };
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
841 931
842# glBegin GL_QUADS; 932 glBegin GL_QUADS;
843# glColor 0, 0, 0, 0;
844# glVertex 0 , 0; 933 glVertex 0 , 0;
845# glVertex 0 , $h; 934 glVertex 0 , $h;
846# glVertex $w, $h; 935 glVertex $w, $h;
847# glVertex $w, 0; 936 glVertex $w, 0;
848# glEnd; 937 glEnd;
849 938
850
851 $self->child->draw;
852 glDisable GL_BLEND; 939 glDisable GL_BLEND;
853 glDisable GL_TEXTURE_2D; 940 }
941
942 $self->SUPER::_draw;
854} 943}
855 944
856############################################################################# 945#############################################################################
857 946
858package CFClient::UI::FancyFrame; 947package CFClient::UI::FancyFrame;
… …
869 my $class = shift; 958 my $class = shift;
870 959
871 # TODO: user_x, user_y, overwrite moveto? 960 # TODO: user_x, user_y, overwrite moveto?
872 961
873 my $self = $class->SUPER::new ( 962 my $self = $class->SUPER::new (
874 bg => [1, 1, 1, 1], 963 bg => [1, 1, 1, 1],
875 border_bg => [1, 1, 1, 1], 964 border_bg => [1, 1, 1, 1],
876 border => 0.6, 965 border => 0.6,
966 is_toplevel => 1,
877 can_events => 1, 967 can_events => 1,
878 @_ 968 @_
879 ); 969 );
880 970
881 $self->{title} &&= new CFClient::UI::Label 971 $self->{title} &&= new CFClient::UI::Label
882 align => 0, 972 align => 0,
… …
906 my ($self, $w, $h) = @_; 996 my ($self, $w, $h) = @_;
907 997
908 $h -= List::Util::max 0, $self->border * 2; 998 $h -= List::Util::max 0, $self->border * 2;
909 $w -= List::Util::max 0, $self->border * 2; 999 $w -= List::Util::max 0, $self->border * 2;
910 1000
911 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1001 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
912 if $self->{title}; 1002 if $self->{title};
913 1003
914 $self->child->configure ($self->border, $self->border, $w, $h); 1004 $self->child->configure ($self->border, $self->border, $w, $h);
915} 1005}
916 1006
… …
974 my ($self) = @_; 1064 my ($self) = @_;
975 1065
976 my ($w, $h ) = ($self->{w}, $self->{h}); 1066 my ($w, $h ) = ($self->{w}, $self->{h});
977 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1067 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
978 1068
979 glEnable GL_BLEND;
980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
981 glEnable GL_TEXTURE_2D; 1069 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1071
984 my $border = $self->border; 1072 my $border = $self->border;
985 1073
986 glColor @{ $self->{border_bg} }; 1074 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad (0, 0, $w, $border); 1075 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad (0, $border, $border, $ch); 1076 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1077 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1078 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1079
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1080 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1081 my $bg = $tex[0];
994 1082
995 # TODO: repeat texture not scale 1083 # TODO: repeat texture not scale
… …
999 glColor @{ $self->{bg} }; 1087 glColor @{ $self->{bg} };
1000 1088
1001 $bg->{s} = $rep_x; 1089 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y; 1090 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1; 1091 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad ($border, $border, $cw, $ch); 1092 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1093 }
1005 1094
1006 glDisable GL_TEXTURE_2D; 1095 glDisable GL_TEXTURE_2D;
1007 glDisable GL_BLEND;
1008 }
1009 1096
1010 $self->{title}->draw if $self->{title}; 1097 $self->{title}->draw if $self->{title};
1011 1098
1012 $self->child->draw; 1099 $self->child->draw;
1013} 1100}
… …
1025sub new { 1112sub new {
1026 my $class = shift; 1113 my $class = shift;
1027 1114
1028 $class->SUPER::new ( 1115 $class->SUPER::new (
1029 col_expand => [], 1116 col_expand => [],
1030 @_ 1117 @_,
1031 ) 1118 )
1119}
1120
1121sub children {
1122 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032} 1123}
1033 1124
1034sub add { 1125sub add {
1035 my ($self, $x, $y, $child) = @_; 1126 my ($self, $x, $y, $child) = @_;
1036 1127
1037 $child->set_parent ($self); 1128 $child->set_parent ($self);
1038 $self->{children}[$y][$x] = $child; 1129 $self->{children}[$y][$x] = $child;
1039 1130
1040 $child->check_size; 1131 $self->check_size (1);
1041} 1132}
1042 1133
1043sub children {
1044 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1045}
1046
1047# TODO: move to container class maybe? send childs a signal on removal? 1134# TODO: move to container class maybe? send children a signal on removal?
1048sub clear { 1135sub clear {
1049 my ($self) = @_; 1136 my ($self) = @_;
1050 1137
1051 my @children = $self->children; 1138 my @children = $self->children;
1052 delete $self->{children}; 1139 delete $self->{children};
… …
1054 for (@children) { 1141 for (@children) {
1055 delete $_->{parent}; 1142 delete $_->{parent};
1056 $_->hide; 1143 $_->hide;
1057 } 1144 }
1058 1145
1146 $self->check_size (1);
1059 $self->update; 1147 $self->update;
1060} 1148}
1061 1149
1062sub get_wh { 1150sub get_wh {
1063 my ($self) = @_; 1151 my ($self) = @_;
… …
1095sub size_allocate { 1183sub size_allocate {
1096 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1097 1185
1098 my ($ws, $hs) = $self->get_wh; 1186 my ($ws, $hs) = $self->get_wh;
1099 1187
1100 my $req_w = sum @$ws; 1188 my $req_w = (sum @$ws) || 1;
1101 my $req_h = sum @$hs; 1189 my $req_h = (sum @$hs) || 1;
1102 1190
1103 # TODO: nicer code && do row_expand 1191 # TODO: nicer code && do row_expand
1104 my @col_expand = @{$self->{col_expand}}; 1192 my @col_expand = @{$self->{col_expand}};
1105 @col_expand = (1) x @$ws unless @col_expand; 1193 @col_expand = (1) x @$ws unless @col_expand;
1106 my $col_expand = (sum @col_expand) || 1; 1194 my $col_expand = (sum @col_expand) || 1;
… …
1240} 1328}
1241 1329
1242sub size_allocate { 1330sub size_allocate {
1243 my ($self, $w, $h) = @_; 1331 my ($self, $w, $h) = @_;
1244 1332
1333 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1334
1245 my $children = $self->{children}; 1335 my $children = $self->{children};
1246 1336
1247 my @h = map $_->{req_h}, @$children; 1337 my @h = map $_->{req_h}, @$children;
1248 1338
1249 my $req_h = List::Util::sum @h; 1339 my $req_h = List::Util::sum @h;
… …
1278 1368
1279############################################################################# 1369#############################################################################
1280 1370
1281package CFClient::UI::Label; 1371package CFClient::UI::Label;
1282 1372
1283our @ISA = CFClient::UI::Base::; 1373our @ISA = CFClient::UI::DrawBG::;
1284 1374
1285use CFClient::OpenGL; 1375use CFClient::OpenGL;
1286 1376
1287sub new { 1377sub new {
1288 my ($class, %arg) = @_; 1378 my ($class, %arg) = @_;
1289 1379
1290 my $self = $class->SUPER::new ( 1380 my $self = $class->SUPER::new (
1291 fg => [1, 1, 1], 1381 fg => [1, 1, 1],
1382 #bg => none
1383 #active_bg => none
1292 #font => default_font 1384 #font => default_font
1385 #text => initial text
1386 #markup => initial narkup
1387 #max_w => maximum pixel width
1388 ellipsise => 3, # end
1389 layout => (new CFClient::Layout),
1293 fontsize => 1, 1390 fontsize => 1,
1294 text => "",
1295 align => -1, 1391 align => -1,
1296 valign => -1, 1392 valign => -1,
1297 padding => 2, 1393 padding => 2,
1298 layout => new CFClient::Layout,
1299 can_events => 0, 1394 can_events => 0,
1300 %arg 1395 %arg
1301 ); 1396 );
1302 1397
1303 if (exists $self->{template}) { 1398 if (exists $self->{template}) {
1304 my $layout = new CFClient::Layout; 1399 my $layout = new CFClient::Layout;
1305 $layout->set_text (delete $self->{template}); 1400 $layout->set_text (delete $self->{template});
1306 $self->{template} = $layout; 1401 $self->{template} = $layout;
1307 } 1402 }
1308 1403
1309 $self->set_text (delete $self->{text}) if exists $self->{text}; 1404 if (exists $self->{markup}) {
1310 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1405 $self->set_markup (delete $self->{markup});
1406 } else {
1407 $self->set_text (delete $self->{text});
1408 }
1311 1409
1312 $self 1410 $self
1313} 1411}
1314 1412
1315sub escape { 1413sub escape($) {
1316 local $_ = $_[1]; 1414 local $_ = $_[0];
1317 1415
1318 s/&/&amp;/g; 1416 s/&/&amp;/g;
1319 s/>/&gt;/g; 1417 s/>/&gt;/g;
1320 s/</&lt;/g; 1418 s/</&lt;/g;
1321 1419
1322 $_[1] 1420 $_
1323} 1421}
1324 1422
1325sub update { 1423sub update {
1326 my ($self) = @_; 1424 my ($self) = @_;
1327 1425
… …
1333 my ($self, $text) = @_; 1431 my ($self, $text) = @_;
1334 1432
1335 return if $self->{text} eq "T$text"; 1433 return if $self->{text} eq "T$text";
1336 $self->{text} = "T$text"; 1434 $self->{text} = "T$text";
1337 1435
1436 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1338 $self->{layout}->set_text ($text); 1437 $self->{layout}->set_text ($text);
1339 1438
1340 delete $self->{texture};
1341 $self->update; 1439 $self->update;
1342 $self->check_size; 1440 $self->check_size;
1343} 1441}
1344 1442
1345sub set_markup { 1443sub set_markup {
1346 my ($self, $markup) = @_; 1444 my ($self, $markup) = @_;
1347 1445
1348 return if $self->{text} eq "M$markup"; 1446 return if $self->{text} eq "M$markup";
1349 $self->{text} = "M$markup"; 1447 $self->{text} = "M$markup";
1350 1448
1449 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1450
1451 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1351 $self->{layout}->set_markup ($markup); 1452 $self->{layout}->set_markup ($markup);
1352 1453
1353 delete $self->{texture};
1354 $self->update; 1454 $self->update;
1355 $self->check_size; 1455 $self->check_size;
1356} 1456}
1357 1457
1358sub size_request { 1458sub size_request {
1359 my ($self) = @_; 1459 my ($self) = @_;
1360 1460
1361 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1461 $self->{layout}->set_font ($self->{font}) if $self->{font};
1362 $self->{layout}->set_width ($self->{max_w} || -1); 1462 $self->{layout}->set_width ($self->{max_w} || -1);
1463 $self->{layout}->set_ellipsise ($self->{ellipsise});
1464 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1363 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1465 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1364 1466
1365 my ($w, $h) = $self->{layout}->size; 1467 my ($w, $h) = $self->{layout}->size;
1366 1468
1367 if (exists $self->{template}) { 1469 if (exists $self->{template}) {
… …
1397} 1499}
1398 1500
1399sub _draw { 1501sub _draw {
1400 my ($self) = @_; 1502 my ($self) = @_;
1401 1503
1504 $self->SUPER::_draw; # draw background, if applicable
1505
1402 my $tex = $self->{texture} ||= do { 1506 my $tex = $self->{texture} ||= do {
1507 $self->{layout}->set_foreground (@{$self->{fg}});
1403 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1508 $self->{layout}->set_font ($self->{font}) if $self->{font};
1404 $self->{layout}->set_width ($self->{w}); 1509 $self->{layout}->set_width ($self->{w});
1510 $self->{layout}->set_ellipsise ($self->{ellipsise});
1511 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1405 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1512 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1513
1406 new_from_layout CFClient::Texture $self->{layout} 1514 my $tex = new_from_layout CFClient::Texture $self->{layout};
1515
1516 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1517 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1518 : ($self->{w} - $tex->{w}) * 0.5);
1519
1520 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1521 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1522 : ($self->{h} - $tex->{h}) * 0.5);
1523
1524 $tex
1407 }; 1525 };
1408 1526
1409 glEnable GL_BLEND;
1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411 glEnable GL_TEXTURE_2D; 1527 glEnable GL_TEXTURE_2D;
1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413 1529
1530 if ($tex->{format} == GL_ALPHA) {
1414 glColor @{$self->{fg}}; 1531 glColor @{$self->{fg}};
1415
1416 $self->{ox} = int (
1417 $self->{align} < 0 ? $self->{padding}
1418 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419 : ($self->{w} - $tex->{w}) * 0.5
1420 );
1421
1422 $self->{oy} = int (
1423 $self->{valign} < 0 ? $self->{padding}
1424 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425 : ($self->{h} - $tex->{h}) * 0.5
1426 );
1427
1428 $tex->draw_quad ($self->{ox}, $self->{oy}); 1532 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1533 } else {
1534 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1535 }
1429 1536
1430 glDisable GL_TEXTURE_2D; 1537 glDisable GL_TEXTURE_2D;
1431 glDisable GL_BLEND;
1432} 1538}
1433 1539
1434############################################################################# 1540#############################################################################
1435 1541
1436package CFClient::UI::EntryBase; 1542package CFClient::UI::EntryBase;
… …
1449 active_fg => [0, 0, 0], 1555 active_fg => [0, 0, 0],
1450 can_hover => 1, 1556 can_hover => 1,
1451 can_focus => 1, 1557 can_focus => 1,
1452 valign => 0, 1558 valign => 0,
1453 can_events => 1, 1559 can_events => 1,
1560 #text => ...
1454 @_ 1561 @_
1455 ) 1562 )
1456} 1563}
1457 1564
1458sub _set_text { 1565sub _set_text {
… …
1468 $self->{text} = $text; 1575 $self->{text} = $text;
1469 1576
1470 $text =~ s/./*/g if $self->{hidden}; 1577 $text =~ s/./*/g if $self->{hidden};
1471 $self->{layout}->set_text ("$text "); 1578 $self->{layout}->set_text ("$text ");
1472 1579
1473 $self->emit (changed => $self->{text}); 1580 $self->_emit (changed => $self->{text});
1474}
1475
1476sub get_text {
1477 $_[0]{text}
1478}
1479
1480sub size_request {
1481 my ($self) = @_;
1482
1483 my ($w, $h) = $self->SUPER::size_request;
1484
1485 ($w + 1, $h) # add 1 for cursor
1486}
1487
1488sub size_allocate {
1489 my ($self, $w, $h) = @_;
1490
1491 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492} 1581}
1493 1582
1494sub set_text { 1583sub set_text {
1495 my ($self, $text) = @_; 1584 my ($self, $text) = @_;
1496 1585
1497 $self->{cursor} = length $text; 1586 $self->{cursor} = length $text;
1498 $self->_set_text ($text); 1587 $self->_set_text ($text);
1499 $self->update; 1588 $self->update;
1589 $self->check_size;
1590}
1591
1592sub get_text {
1593 $_[0]{text}
1594}
1595
1596sub size_request {
1597 my ($self) = @_;
1598
1599 my ($w, $h) = $self->SUPER::size_request;
1600
1601 ($w + 1, $h) # add 1 for cursor
1500} 1602}
1501 1603
1502sub key_down { 1604sub key_down {
1503 my ($self, $ev) = @_; 1605 my ($self, $ev) = @_;
1504 1606
… …
1506 my $sym = $ev->{sym}; 1608 my $sym = $ev->{sym};
1507 my $uni = $ev->{unicode}; 1609 my $uni = $ev->{unicode};
1508 1610
1509 my $text = $self->get_text; 1611 my $text = $self->get_text;
1510 1612
1511 if ($sym == 8) { 1613 if ($uni == 8) {
1512 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1614 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513 } elsif ($sym == 127) { 1615 } elsif ($uni == 127) {
1514 substr $text, $self->{cursor}, 1, ""; 1616 substr $text, $self->{cursor}, 1, "";
1515 } elsif ($sym == CFClient::SDLK_LEFT) { 1617 } elsif ($sym == CFClient::SDLK_LEFT) {
1516 --$self->{cursor} if $self->{cursor}; 1618 --$self->{cursor} if $self->{cursor};
1517 } elsif ($sym == CFClient::SDLK_RIGHT) { 1619 } elsif ($sym == CFClient::SDLK_RIGHT) {
1518 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1620 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1519 } elsif ($sym == CFClient::SDLK_HOME) { 1621 } elsif ($sym == CFClient::SDLK_HOME) {
1520 $self->{cursor} = 0; 1622 $self->{cursor} = 0;
1521 } elsif ($sym == CFClient::SDLK_END) { 1623 } elsif ($sym == CFClient::SDLK_END) {
1522 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1523 } elsif ($sym == 27) { 1625 } elsif ($uni == 27) {
1524 $self->emit ('escape'); 1626 $self->_emit ('escape');
1525 } elsif ($uni) { 1627 } elsif ($uni) {
1526 substr $text, $self->{cursor}++, 0, chr $uni; 1628 substr $text, $self->{cursor}++, 0, chr $uni;
1527 } 1629 }
1528 1630
1529 $self->_set_text ($text); 1631 $self->_set_text ($text);
1530 $self->update; 1632 $self->update;
1633 $self->check_size;
1531} 1634}
1532 1635
1533sub focus_in { 1636sub focus_in {
1534 my ($self) = @_; 1637 my ($self) = @_;
1535 1638
… …
1615 if ($sym == 13) { 1718 if ($sym == 13) {
1616 unshift @{$self->{history}}, 1719 unshift @{$self->{history}},
1617 my $txt = $self->get_text; 1720 my $txt = $self->get_text;
1618 $self->{history_pointer} = -1; 1721 $self->{history_pointer} = -1;
1619 $self->{history_saveback} = ''; 1722 $self->{history_saveback} = '';
1620 $self->emit (activate => $txt); 1723 $self->_emit (activate => $txt);
1621 $self->update; 1724 $self->update;
1622 1725
1623 } elsif ($sym == CFClient::SDLK_UP) { 1726 } elsif ($sym == CFClient::SDLK_UP) {
1624 if ($self->{history_pointer} < 0) { 1727 if ($self->{history_pointer} < 0) {
1625 $self->{history_saveback} = $self->get_text; 1728 $self->{history_saveback} = $self->get_text;
… …
1664 my $class = shift; 1767 my $class = shift;
1665 1768
1666 $class->SUPER::new ( 1769 $class->SUPER::new (
1667 padding => 4, 1770 padding => 4,
1668 fg => [1, 1, 1], 1771 fg => [1, 1, 1],
1669 bg => [1, 1, 1, 0.2],
1670 active_fg => [0, 0, 1], 1772 active_fg => [0, 0, 1],
1671 can_hover => 1, 1773 can_hover => 1,
1672 align => 0, 1774 align => 0,
1673 valign => 0, 1775 valign => 0,
1674 can_events => 1, 1776 can_events => 1,
1675 @_ 1777 @_
1676 ) 1778 )
1677} 1779}
1678 1780
1781sub activate { }
1782
1679sub button_up { 1783sub button_up {
1680 my ($self, $ev, $x, $y) = @_; 1784 my ($self, $ev, $x, $y) = @_;
1681 1785
1786 $self->emit ("activate")
1682 if ($x >= 0 && $x < $self->{w} 1787 if $x >= 0 && $x < $self->{w}
1683 && $y >= 0 && $y < $self->{h}) { 1788 && $y >= 0 && $y < $self->{h};
1684 $self->emit ("activate");
1685 }
1686} 1789}
1687 1790
1688sub _draw { 1791sub _draw {
1689 my ($self) = @_; 1792 my ($self) = @_;
1690 1793
… …
1692 1795
1693 if ($GRAB == $self) { 1796 if ($GRAB == $self) {
1694 $self->{fg} = $self->{active_fg}; 1797 $self->{fg} = $self->{active_fg};
1695 } 1798 }
1696 1799
1697 glEnable GL_BLEND;
1698 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699 glEnable GL_TEXTURE_2D; 1800 glEnable GL_TEXTURE_2D;
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 glColor 0, 0, 0, 1; 1802 glColor 0, 0, 0, 1;
1702 1803
1703 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1804 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704 1805
1705 glDisable GL_TEXTURE_2D; 1806 glDisable GL_TEXTURE_2D;
1706 glDisable GL_BLEND;
1707 1807
1708 $self->SUPER::_draw; 1808 $self->SUPER::_draw;
1709} 1809}
1710 1810
1711############################################################################# 1811#############################################################################
… …
1725 1825
1726 $class->SUPER::new ( 1826 $class->SUPER::new (
1727 padding => 2, 1827 padding => 2,
1728 fg => [1, 1, 1], 1828 fg => [1, 1, 1],
1729 active_fg => [1, 1, 0], 1829 active_fg => [1, 1, 0],
1830 bg => [0, 0, 0, 0.2],
1831 active_bg => [1, 1, 1, 0.5],
1730 state => 0, 1832 state => 0,
1731 can_hover => 1, 1833 can_hover => 1,
1732 @_ 1834 @_
1733 ) 1835 )
1734} 1836}
… …
1743 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1744 1846
1745 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1746 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1747 $self->{state} = !$self->{state}; 1849 $self->{state} = !$self->{state};
1748 $self->emit (changed => $self->{state}); 1850 $self->_emit (changed => $self->{state});
1749 } 1851 }
1750} 1852}
1751 1853
1752sub _draw { 1854sub _draw {
1753 my ($self) = @_; 1855 my ($self) = @_;
… …
1758 1860
1759 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1861 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1760 1862
1761 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1863 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762 1864
1763 glEnable GL_BLEND; 1865 my $tex = $self->{state} ? $tex[1] : $tex[0];
1866
1764 glEnable GL_TEXTURE_2D; 1867 glEnable GL_TEXTURE_2D;
1765 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767 my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769 $tex->draw_quad (0, 0, $s, $s); 1868 $tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771 glDisable GL_TEXTURE_2D; 1869 glDisable GL_TEXTURE_2D;
1772 glDisable GL_BLEND;
1773} 1870}
1774 1871
1775############################################################################# 1872#############################################################################
1776 1873
1777package CFClient::UI::Image; 1874package CFClient::UI::Image;
… …
1820 glTranslate 0, -$self->{w}, 0; 1917 glTranslate 0, -$self->{w}, 0;
1821 1918
1822 ($w, $h) = ($h, $w); 1919 ($w, $h) = ($h, $w);
1823 } 1920 }
1824 1921
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D; 1922 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 1924
1830 $tex->draw_quad (0, 0, $w, $h); 1925 $tex->draw_quad_alpha (0, 0, $w, $h);
1831 1926
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D; 1927 glDisable GL_TEXTURE_2D;
1834} 1928}
1835 1929
1836############################################################################# 1930#############################################################################
1837 1931
… …
2026 qw(s1_slider.png s1_slider_bg.png); 2120 qw(s1_slider.png s1_slider_bg.png);
2027 2121
2028sub new { 2122sub new {
2029 my $class = shift; 2123 my $class = shift;
2030 2124
2031 # range [value, low, high, page] 2125 # range [value, low, high, page, unit]
2032 2126
2033 # TODO: 0-width page 2127 # TODO: 0-width page
2034 # TODO: req_w/h are wrong with vertical 2128 # TODO: req_w/h are wrong with vertical
2035 # TODO: calculations are off 2129 # TODO: calculations are off
2036 my $self = $class->SUPER::new ( 2130 my $self = $class->SUPER::new (
2037 fg => [1, 1, 1], 2131 fg => [1, 1, 1],
2038 active_fg => [0, 0, 0], 2132 active_fg => [0, 0, 0],
2133 bg => [0, 0, 0, 0.2],
2134 active_bg => [1, 1, 1, 0.5],
2039 range => [0, 0, 100, 10], 2135 range => [0, 0, 100, 10, 0],
2040 req_w => $::WIDTH / 80, 2136 req_w => $::WIDTH / 80,
2041 req_h => $::WIDTH / 80, 2137 req_h => $::WIDTH / 80,
2042 vertical => 0, 2138 vertical => 0,
2043 can_hover => 1, 2139 can_hover => 1,
2044 inner_pad => 5, 2140 inner_pad => 0.02,
2045 @_ 2141 @_
2046 ); 2142 );
2047 2143
2144 $self->set_value ($self->{range}[0]);
2145 $self->update;
2146
2048 $self 2147 $self
2148}
2149
2150sub set_range {
2151 my ($self, $range) = @_;
2152
2153 ($range, $self->{range}) = ($self->{range}, $range);
2154
2155 $self->update
2156 if "@$range" ne "@{$self->{range}}";
2157}
2158
2159sub set_value {
2160 my ($self, $value) = @_;
2161
2162 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2163
2164 $hi = $lo + 1 if $hi <= $lo;
2165
2166 $page = $hi - $lo if $page > $hi - $lo;
2167
2168 $value = $lo if $value < $lo;
2169 $value = $hi - $page if $value > $hi - $page;
2170
2171 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2172 if $unit;
2173
2174 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2175
2176 if ($value != $old_value) {
2177 $self->_emit (changed => $value);
2178 $self->update;
2179 }
2049} 2180}
2050 2181
2051sub size_request { 2182sub size_request {
2052 my ($self) = @_; 2183 my ($self) = @_;
2053 2184
… …
2059 2190
2060sub button_down { 2191sub button_down {
2061 my ($self, $ev, $x, $y) = @_; 2192 my ($self, $ev, $x, $y) = @_;
2062 2193
2063 $self->SUPER::button_down ($ev, $x, $y); 2194 $self->SUPER::button_down ($ev, $x, $y);
2195
2196 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197
2064 $self->mouse_motion ($ev, $x, $y); 2198 $self->mouse_motion ($ev, $x, $y);
2065} 2199}
2066 2200
2067sub mouse_motion { 2201sub mouse_motion {
2068 my ($self, $ev, $x, $y) = @_; 2202 my ($self, $ev, $x, $y) = @_;
2069 2203
2070 if ($GRAB == $self) { 2204 if ($GRAB == $self) {
2205 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2206
2207 my (undef, $lo, $hi, $page) = @{$self->{range}};
2208
2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2210
2211 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2212 }
2213}
2214
2215sub update {
2216 my ($self) = @_;
2217
2218 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2219 $self->set_value ($self->{range}[0]);
2220
2071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2221 my ($value, $lo, $hi, $page) = @{$self->{range}};
2222 my $range = ($hi - $page - $lo) || 1e-100;
2072 2223
2073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2224 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2074 2225
2075 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2226 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2076 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2227 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2077 2228
2078 $x -= $inner_pad_px; # substract the padding 2229 $value = ($value - $lo) / $range;
2079 $x = $x * ($hi - $lo) / $inner_w + $lo; 2230 $value = $value * $self->{scale} + $self->{offset};
2080 $x = $lo if $x < $lo;
2081 $x = $hi - $page if $x > $hi - $page;
2082 $self->{range}[0] = $x;
2083 2231
2084 $self->emit (changed => $x); 2232 $self->{knob_x} = $value - $knob_w * 0.5;
2085 $self->update; 2233 $self->{knob_w} = $knob_w;
2086 } 2234 });
2087}
2088 2235
2089# the inner_* stuff is for generating a padding for the slider handle, 2236 $self->SUPER::update;
2090# so that the handle doesn't leave the texture. This calculation isn't 100%
2091# correct propably, but it does the job for now
2092sub _calc_inner_pad_px {
2093 my ($self, $w) = @_;
2094 ($w / 100) * $self->{inner_pad} # % to pixels
2095} 2237}
2096 2238
2097sub _draw { 2239sub _draw {
2098 my ($self) = @_; 2240 my ($self) = @_;
2099 2241
2100 $self->SUPER::_draw (); 2242 $self->SUPER::_draw ();
2101 2243
2102 my ($w, $h) = @$self{qw(w h)}; 2244 glScale $self->{w}, $self->{h};
2103 2245
2104 if ($self->{vertical}) { 2246 if ($self->{vertical}) {
2105 # draw a vertical slider like a rotated horizontal slider 2247 # draw a vertical slider like a rotated horizontal slider
2106 2248
2249 glTranslate 1, 0, 0;
2107 glRotate 90, 0, 0, 1; 2250 glRotate 90, 0, 0, 1;
2108 glTranslate 0, -$self->{w}, 0;
2109
2110 ($w, $h) = ($h, $w);
2111 } 2251 }
2112 2252
2113 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2253 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2254 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115 2255
2116 my ($value, $lo, $hi, $page) = @{$self->{range}};
2117
2118 $hi = $value + 1 if $lo == $hi;
2119
2120 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2121 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2122
2123 $page = int $page * $inner_w / ($hi - $lo);
2124 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2125
2126 $w -= $page;
2127 $page &= ~1;
2128 glTranslate $page * 0.5, 0, 0;
2129 $page ||= 2;
2130
2131 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133
2134 glEnable GL_BLEND;
2135 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138 2258
2139 # draw background 2259 # draw background
2140 $tex[1]->draw_quad (0, 0, $w, $h); 2260 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141 2261
2142 # draw handle 2262 # draw handle
2143 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2263 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144 2264
2145 glDisable GL_BLEND;
2146 glDisable GL_TEXTURE_2D; 2265 glDisable GL_TEXTURE_2D;
2147} 2266}
2267
2268#############################################################################
2269
2270package CFClient::UI::ValSlider;
2271
2272our @ISA = CFClient::UI::HBox::;
2273
2274sub new {
2275 my ($class, %arg) = @_;
2276
2277 my $range = delete $arg{range};
2278
2279 my $self = $class->SUPER::new (
2280 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2281 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2282 to_value => sub { shift },
2283 from_value => sub { shift },
2284 %arg,
2285 );
2286
2287 $self->{slider}->connect (changed => sub {
2288 my ($self, $value) = @_;
2289 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2290 $self->{parent}->emit (changed => $value);
2291 });
2292
2293# $self->{entry}->connect (changed => sub {
2294# my ($self, $value) = @_;
2295# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2296# $self->{parent}->emit (changed => $value);
2297# });
2298
2299 $self->add ($self->{slider}, $self->{entry});
2300
2301 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2302
2303 $self
2304}
2305
2306sub set_range { shift->{slider}->set_range (@_) }
2307sub set_value { shift->{slider}->set_value (@_) }
2148 2308
2149############################################################################# 2309#############################################################################
2150 2310
2151package CFClient::UI::TextView; 2311package CFClient::UI::TextView;
2152 2312
… …
2161 fontsize => 1, 2321 fontsize => 1,
2162 can_events => 0, 2322 can_events => 0,
2163 #font => default_font 2323 #font => default_font
2164 @_, 2324 @_,
2165 2325
2166 layout => (new CFClient::Layout), 2326 layout => (new CFClient::Layout 1),
2167 par => [], 2327 par => [],
2168 height => 0, 2328 height => 0,
2169 children => [ 2329 children => [
2170 (new CFClient::UI::Empty expand => 1), 2330 (new CFClient::UI::Empty expand => 1),
2171 (new CFClient::UI::Slider vertical => 1), 2331 (new CFClient::UI::Slider vertical => 1),
… …
2182 2342
2183 $self->{fontsize} = $fontsize; 2343 $self->{fontsize} = $fontsize;
2184 $self->reflow; 2344 $self->reflow;
2185} 2345}
2186 2346
2187sub text_height {
2188 my ($self, $text) = @_;
2189
2190 my $layout = $self->{layout};
2191
2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193 $layout->set_width ($self->{children}[0]{w});
2194 $layout->set_text ($text);
2195
2196 ($layout->size)[1]
2197}
2198
2199sub reflow {
2200 my ($self) = @_;
2201
2202 $self->{need_reflow}++;
2203 $self->update;
2204}
2205
2206sub size_allocate { 2347sub size_allocate {
2207 my ($self, $w, $h) = @_; 2348 my ($self, $w, $h) = @_;
2208 2349
2209 $self->SUPER::size_allocate ($w, $h); 2350 $self->SUPER::size_allocate ($w, $h);
2210 2351
… …
2213 $self->{layout}->set_width ($self->{children}[0]{w}); 2354 $self->{layout}->set_width ($self->{children}[0]{w});
2214 2355
2215 $self->reflow; 2356 $self->reflow;
2216} 2357}
2217 2358
2359sub text_size {
2360 my ($self, $text, $indent) = @_;
2361
2362 my $layout = $self->{layout};
2363
2364 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2365 $layout->set_width ($self->{children}[0]{w} - $indent);
2366 $layout->set_markup ($text);
2367
2368 $layout->size
2369}
2370
2371sub reflow {
2372 my ($self) = @_;
2373
2374 $self->{need_reflow}++;
2375 $self->update;
2376}
2377
2378sub set_offset {
2379 my ($self, $offset) = @_;
2380
2381 # todo: base offset on lines or so, not on pixels
2382 $self->{children}[1]->set_value ($offset);
2383}
2384
2385sub clear {
2386 my ($self) = @_;
2387
2388 $self->{par} = [];
2389 $self->{height} = 0;
2390 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2391}
2392
2218sub add_paragraph { 2393sub add_paragraph {
2219 my ($self, $color, $text) = @_; 2394 my ($self, $color, $text, $indent) = @_;
2220 2395
2221 #TODO: intelligently "reformat" paragraph 2396 for my $line (split /\n/, $text) {
2222 2397 my ($w, $h) = $self->text_size ($line);
2223 my $height = $self->text_height ($text);
2224
2225 $self->{height} += $height; 2398 $self->{height} += $h;
2399 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2400 }
2226 2401
2227 push @{$self->{par}}, [$height, $color, $text];
2228
2229 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2402 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2230 $self->{children}[1]->update;
2231} 2403}
2232 2404
2233sub update { 2405sub update {
2234 my ($self) = @_; 2406 my ($self) = @_;
2235 2407
… …
2237 2409
2238 return unless $self->{h} > 0; 2410 return unless $self->{h} > 0;
2239 2411
2240 delete $self->{texture}; 2412 delete $self->{texture};
2241 2413
2242 $ROOT->on_refresh ($self, sub { 2414 $ROOT->on_post_alloc ($self, sub {
2415 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2416
2243 if (delete $self->{need_reflow}) { 2417 if (delete $self->{need_reflow}) {
2244 my $height = 0; 2418 my $height = 0;
2245 2419
2246 $height += $_->[0] = $self->text_height ($_->[2]) 2420 my $layout = $self->{layout};
2421
2422 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2423
2247 for @{$self->{par}}; 2424 for (@{$self->{par}}) {
2425 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2426 $layout->set_width ($W - $_->[3]);
2427 $layout->set_markup ($_->[4]);
2428 my ($w, $h) = $layout->size;
2429 $_->[0] = $w + $_->[3];
2430 $_->[1] = $h;
2431 }
2432
2433 $height += $_->[1];
2434 }
2248 2435
2249 $self->{height} = $height; 2436 $self->{height} = $height;
2250 2437
2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2438 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2252 2439
2253 delete $self->{texture}; 2440 delete $self->{texture};
2254 } 2441 }
2255 2442
2256 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2443 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2257 glClearColor 0, 0, 0, 0; 2444 glClearColor 0.5, 0.5, 0.5, 0;
2258 glClear GL_COLOR_BUFFER_BIT; 2445 glClear GL_COLOR_BUFFER_BIT;
2259 2446
2447 my $top = int $self->{children}[1]{range}[0];
2448
2449 my $y0 = $top;
2450 my $y1 = $top + $H;
2451
2452 my $y = 0;
2453
2454 my $layout = $self->{layout};
2455
2456 $layout->set_font ($self->{font}) if $self->{font};
2457
2260 glEnable GL_BLEND; 2458 glEnable GL_BLEND;
2459 #TODO# not correct in windows where rgba is forced off
2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2460 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2262 glEnable GL_TEXTURE_2D;
2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264
2265 my $top = int $self->{children}[1]{range}[0];
2266
2267 my $y0 = $top;
2268 my $y1 = $top + $self->{h};
2269
2270 my $y = 0;
2271
2272 my $layout = $self->{layout};
2273
2274 $layout->set_font ($self->{font}) if $self->{font};
2275 2461
2276 for my $par (@{$self->{par}}) { 2462 for my $par (@{$self->{par}}) {
2277 my $h = $par->[0]; 2463 my $h = $par->[1];
2278 2464
2279 if ($y0 < $y + $h && $y < $y1) { 2465 if ($y0 < $y + $h && $y < $y1) {
2466 $layout->set_foreground (@{ $par->[2] });
2467 $layout->set_width ($W - $par->[3]);
2280 $layout->set_text ($par->[2]); 2468 $layout->set_markup ($par->[4]);
2281 2469
2282 glColor @{ $par->[1] }; 2470 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2283 my ($W, $H) = $layout->size; 2471
2284 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2472 glRasterPos $par->[3], $y - $y0;
2473 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2285 } 2474 }
2286 2475
2287 $y += $h; 2476 $y += $h;
2288 } 2477 }
2289 2478
2290 glDisable GL_TEXTURE_2D;
2291 glDisable GL_BLEND; 2479 glDisable GL_BLEND;
2292 }; 2480 };
2293 }); 2481 });
2294} 2482}
2295 2483
2296sub _draw { 2484sub _draw {
2297 my ($self) = @_; 2485 my ($self) = @_;
2298 2486
2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301 glEnable GL_TEXTURE_2D; 2487 glEnable GL_TEXTURE_2D;
2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2488 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1; 2489 glColor 1, 1, 1, 1;
2304 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2490 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2305 glDisable GL_TEXTURE_2D; 2491 glDisable GL_TEXTURE_2D;
2306 glDisable GL_BLEND;
2307 2492
2308 $self->{children}[1]->draw; 2493 $self->{children}[1]->draw;
2309 2494
2310} 2495}
2311 2496
… …
2379 2564
2380 # TODO: use animation 2565 # TODO: use animation
2381 if ($self->{state} = !$self->{state}) { 2566 if ($self->{state} = !$self->{state}) {
2382 $CFClient::UI::ROOT->add ($self->{other}); 2567 $CFClient::UI::ROOT->add ($self->{other});
2383 $self->{other}->move ($self->coord2global (0, $self->{h})); 2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2384 $self->emit ("open"); 2569 $self->_emit ("open");
2385 } else { 2570 } else {
2386 $CFClient::UI::ROOT->remove ($self->{other}); 2571 $CFClient::UI::ROOT->remove ($self->{other});
2387 $self->emit ("close"); 2572 $self->_emit ("close");
2388 } 2573 }
2389 2574
2390 $self->emit (changed => $self->{state}); 2575 $self->_emit (changed => $self->{state});
2391} 2576}
2392 2577
2393############################################################################# 2578#############################################################################
2394 2579
2395package CFClient::UI::Tooltip; 2580package CFClient::UI::Tooltip;
… …
2405 @_, 2590 @_,
2406 can_events => 0, 2591 can_events => 0,
2407 ) 2592 )
2408} 2593}
2409 2594
2410sub set_markup { 2595sub set_tooltip_from {
2411 my ($self, $text) = @_; 2596 my ($self, $widget) = @_;
2412 2597
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2598 $self->add (new CFClient::UI::Label
2414 $self->{label}->set_markup ($text); 2599 markup => $widget->{tooltip},
2415 $self->add ($self->{label}); 2600 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2601 fontsize => 0.8,
2602 fg => [0, 0, 0, 1],
2603 ellipsise => 0,
2604 font => ($widget->{tooltip_font} || $::FONT_PROP),
2605 );
2416} 2606}
2417 2607
2418sub size_request { 2608sub size_request {
2419 my ($self) = @_; 2609 my ($self) = @_;
2420
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422 2610
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2611 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424 2612
2425 ($w + 4, $h + 4) 2613 ($w + 4, $h + 4)
2426} 2614}
… …
2432} 2620}
2433 2621
2434sub _draw { 2622sub _draw {
2435 my ($self) = @_; 2623 my ($self) = @_;
2436 2624
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375; 2625 glTranslate 0.375, 0.375;
2439 2626
2440 my ($w, $h) = @$self{qw(w h)}; 2627 my ($w, $h) = @$self{qw(w h)};
2441 2628
2442 glColor 1, 0.8, 0.4; 2629 glColor 1, 0.8, 0.4;
… …
2453 glVertex 0 , $h; 2640 glVertex 0 , $h;
2454 glVertex $w, $h; 2641 glVertex $w, $h;
2455 glVertex $w, 0; 2642 glVertex $w, 0;
2456 glEnd; 2643 glEnd;
2457 2644
2458 glPopMatrix; 2645 glTranslate 2 - 0.375, 2 - 0.375;
2459
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw; 2646 $self->SUPER::_draw;
2462} 2647}
2463 2648
2464############################################################################# 2649#############################################################################
2465 2650
… …
2470use CFClient::OpenGL; 2655use CFClient::OpenGL;
2471 2656
2472sub new { 2657sub new {
2473 my $class = shift; 2658 my $class = shift;
2474 2659
2475 $class->SUPER::new ( 2660 my $self = $class->SUPER::new (
2476 aspect => 1, 2661 aspect => 1,
2662 can_events => 0,
2477 @_, 2663 @_,
2478 ) 2664 );
2665
2666 if ($self->{anim} && $self->{animspeed}) {
2667 Scalar::Util::weaken (my $widget = $self);
2668
2669 $self->{timer} = Event->timer (
2670 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2671 hard => 1,
2672 interval => $self->{animspeed},
2673 cb => sub {
2674 ++$widget->{frame};
2675 $widget->update;
2676 },
2677 );
2678 }
2679
2680 $self
2479} 2681}
2480 2682
2481sub size_request { 2683sub size_request {
2482 (32, 8) 2684 (32, 8)
2483} 2685}
2484 2686
2687sub update {
2688 my ($self) = @_;
2689
2690 return unless $self->{visible};
2691
2692 $self->SUPER::update;
2693}
2694
2485sub _draw { 2695sub _draw {
2486 my ($self) = @_; 2696 my ($self) = @_;
2487 2697
2488 return unless $::CONN;#d# manage and cache textures differently 2698 return unless $::CONN;
2699
2700 my $face;
2701
2702 if ($self->{frame}) {
2703 my $anim = $::CONN->{anim}[$self->{anim}];
2704
2705 $face = $anim->[ $self->{frame} % @$anim ]
2706 if $anim && @$anim;
2707 }
2708
2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2709 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2490 2710
2491 # TODO animation
2492 if ($tex) { 2711 if ($tex) {
2493 glEnable GL_BLEND;
2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495 glEnable GL_TEXTURE_2D; 2712 glEnable GL_TEXTURE_2D;
2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497 glColor 1, 1, 1, 1; 2714 glColor 1, 1, 1, 1;
2498 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2715 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499 glDisable GL_TEXTURE_2D; 2716 glDisable GL_TEXTURE_2D;
2500 glDisable GL_BLEND;
2501 } 2717 }
2718}
2719
2720sub DESTROY {
2721 my ($self) = @_;
2722
2723 $self->{timer}->cancel
2724 if $self->{timer};
2725
2726 $self->SUPER::DESTROY;
2502} 2727}
2503 2728
2504############################################################################# 2729#############################################################################
2505 2730
2506package CFClient::UI::InventoryItem; 2731package CFClient::UI::Inventory;
2507 2732
2508our @ISA = CFClient::UI::HBox::; 2733our @ISA = CFClient::UI::ScrolledWindow::;
2509 2734
2510sub new { 2735sub new {
2511 my $class = shift; 2736 my $class = shift;
2512 2737
2513 my %args = @_;
2514
2515 my $item = $args{item};
2516
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521
2522 my $self = $class->SUPER::new ( 2738 my $self = $class->SUPER::new (
2523 can_hover => 1, 2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2524 can_events => 1,
2525 tooltip => (CFClient::UI::Label->escape ($desc)
2526 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2527 connect_button_down => sub {
2528 my ($self, $ev, $x, $y) = @_;
2529
2530 # todo: maybe put examine on 1? but should just be a tooltip :(
2531 if ($ev->{button} == 1) {
2532 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2533 } elsif ($ev->{button} == 2) {
2534 $::CONN->send ("apply $item->{tag}");
2535 } elsif ($ev->{button} == 3) {
2536 CFClient::UI::Menu->new (
2537 items => [
2538 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2539 [
2540 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2541 sub { $::CONN->send ("lock $item->{tag}") },
2542 ],
2543 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2544 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2545 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2546 ],
2547 )->popup ($ev);
2548 }
2549
2550 1
2551 },
2552 %args
2553 );
2554 $self->add(new CFClient::UI::Face
2555 can_events => 0,
2556 face => $item->{face},
2557 anim => $item->{anim},
2558 animspeed => $item->{animspeed});
2559 $self->add(new CFClient::UI::Label
2560 can_events => 0,
2561 text => $desc);
2562
2563 $self
2564}
2565
2566#############################################################################
2567
2568package CFClient::UI::Inventory;
2569
2570our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572sub new {
2573 my $class = shift;
2574
2575 my $self = $class->SUPER::new (
2576 scrolled => (new CFClient::UI::VBox),
2577 @_, 2740 @_,
2578 ); 2741 );
2579 2742
2580 $self 2743 $self
2581} 2744}
… …
2584 my ($self, $items) = @_; 2747 my ($self, $items) = @_;
2585 2748
2586 $self->{scrolled}->clear; 2749 $self->{scrolled}->clear;
2587 return unless $items; 2750 return unless $items;
2588 2751
2589 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2752 my @items = sort {
2753 ($a->{type} <=> $b->{type})
2754 or ($a->{name} cmp $b->{name})
2755 } @$items;
2590 2756
2591 $self->{real_items} = \@items; 2757 $self->{real_items} = \@items;
2592 2758
2759 my $row = 0;
2593 for my $item (@items) { 2760 for my $item (@items) {
2594 my $desc = $item->{nrof} < 2 2761 CFClient::Item::update_widgets $item;
2595 ? $item->{name}
2596 : "$item->{nrof} $item->{name_pl}";
2597 2762
2598 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2599 } 2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2600 2766
2601# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2767 $row++;
2768 }
2602} 2769}
2603 2770
2604sub size_request { 2771sub size_request {
2605 my ($self) = @_; 2772 my ($self) = @_;
2606 ($self->{req_w}, $self->{req_h}); 2773 ($self->{req_w}, $self->{req_h});
… …
2646 2813
2647# popup given the event (must be a mouse button down event currently) 2814# popup given the event (must be a mouse button down event currently)
2648sub popup { 2815sub popup {
2649 my ($self, $ev) = @_; 2816 my ($self, $ev) = @_;
2650 2817
2651 $self->emit ("popdown"); 2818 $self->_emit ("popdown");
2652 2819
2653 # maybe save $GRAB? must be careful about events... 2820 # maybe save $GRAB? must be careful about events...
2654 $GRAB = $self; 2821 $GRAB = $self;
2655 $self->{button} = $ev->{button}; 2822 $self->{button} = $ev->{button};
2656 2823
… …
2671 2838
2672 if ($ev->{button} == $self->{button}) { 2839 if ($ev->{button} == $self->{button}) {
2673 undef $GRAB; 2840 undef $GRAB;
2674 $self->hide; 2841 $self->hide;
2675 2842
2676 $self->emit ("popdown"); 2843 $self->_emit ("popdown");
2677 $self->{hover}[1]->() if $self->{hover}; 2844 $self->{hover}[1]->() if $self->{hover};
2678 } 2845 }
2679} 2846}
2680 2847
2681############################################################################# 2848#############################################################################
2682 2849
2850package CFClient::UI::Statusbox;
2851
2852our @ISA = CFClient::UI::VBox::;
2853
2854sub new {
2855 my $class = shift;
2856
2857 $class->SUPER::new (
2858 fontsize => 0.8,
2859 @_,
2860 )
2861}
2862
2863sub reorder {
2864 my ($self) = @_;
2865 my $NOW = time;
2866
2867 while (my ($k, $v) = each %{ $self->{item} }) {
2868 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2869 }
2870
2871 my @widgets;
2872
2873 my @items = sort {
2874 $a->{pri} <=> $b->{pri}
2875 or $b->{id} <=> $a->{id}
2876 } values %{ $self->{item} };
2877
2878 my $count = 10 + 1;
2879 for my $item (@items) {
2880 last unless --$count;
2881
2882 push @widgets, $item->{label} ||= do {
2883 # TODO: doesn't handle markup well (read as: at all)
2884 my $short = $item->{count} > 1
2885 ? "<b>$item->{count} ×</b> $item->{text}"
2886 : $item->{text};
2887
2888 for ($short) {
2889 s/^\s+//;
2890 s/\s+/ /g;
2891 }
2892
2893 new CFClient::UI::Label
2894 markup => $short,
2895 tooltip => $item->{tooltip},
2896 tooltip_font => $::FONT_PROP,
2897 tooltip_width => 0.67,
2898 fontsize => $item->{fontsize} || $self->{fontsize},
2899 max_w => $::WIDTH * 0.44,
2900 fg => $item->{fg},
2901 can_events => 1,
2902 can_hover => 1
2903 };
2904 }
2905
2906 $self->clear;
2907 $self->SUPER::add (reverse @widgets);
2908}
2909
2910sub add {
2911 my ($self, $text, %arg) = @_;
2912
2913 $text =~ s/^\s+//;
2914 $text =~ s/\s+$//;
2915
2916 return unless $text;
2917
2918 my $timeout = time + ((delete $arg{timeout}) || 60);
2919
2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2921
2922 if (my $item = $self->{item}{$group}) {
2923 if ($item->{text} eq $text) {
2924 $item->{count}++;
2925 } else {
2926 $item->{count} = 1;
2927 $item->{text} = $item->{tooltip} = $text;
2928 }
2929 $item->{id} = ++$self->{id};
2930 $item->{timeout} = $timeout;
2931 delete $item->{label};
2932 } else {
2933 $self->{item}{$group} = {
2934 id => ++$self->{id},
2935 text => $text,
2936 timeout => $timeout,
2937 tooltip => $text,
2938 fg => [0.8, 0.8, 0.8, 0.8],
2939 pri => 0,
2940 count => 1,
2941 %arg,
2942 };
2943 }
2944
2945 $self->reorder;
2946}
2947
2948sub reconfigure {
2949 my ($self) = @_;
2950
2951 delete $_->{label}
2952 for values %{ $self->{item} || {} };
2953
2954 $self->reorder;
2955 $self->SUPER::reconfigure;
2956}
2957
2958#############################################################################
2959
2683package CFClient::UI::Root; 2960package CFClient::UI::Root;
2684 2961
2685our @ISA = CFClient::UI::Container::; 2962our @ISA = CFClient::UI::Container::;
2686 2963
2687use CFClient::OpenGL; 2964use CFClient::OpenGL;
2688 2965
2966sub new {
2967 my $class = shift;
2968
2969 $class->SUPER::new (
2970 visible => 1,
2971 @_,
2972 )
2973}
2974
2975sub configure {
2976 my ($self, $x, $y, $w, $h) = @_;
2977
2978 $self->{w} = $w;
2979 $self->{h} = $h;
2980}
2981
2689sub check_size { 2982sub check_size {
2690 my ($self) = @_; 2983 my ($self) = @_;
2691 2984
2692 $self->configure (0, 0, $self->{w}, $self->{h}); 2985 $self->size_allocate ($self->{w}, $self->{h})
2986 if $self->{w};
2693} 2987}
2694 2988
2695sub size_request { 2989sub size_request {
2696 my ($self) = @_; 2990 my ($self) = @_;
2697 2991
… …
2699} 2993}
2700 2994
2701sub size_allocate { 2995sub size_allocate {
2702 my ($self, $w, $h) = @_; 2996 my ($self, $w, $h) = @_;
2703 2997
2704 my $old_w = $self->{old_w};
2705 my $old_h = $self->{old_h};
2706
2707 if ($old_w && $old_h) {
2708 for my $child ($self->children) {
2709 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2710 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2711 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2712 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2713 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2714 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2715 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2716 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2717 }
2718 }
2719
2720 $self->{old_w} = $w;
2721 $self->{old_h} = $h;
2722}
2723
2724sub configure {
2725 my ($self, $x, $y, $w, $h) = @_;
2726
2727 $self->SUPER::configure ($x, $y, $w, $h);
2728
2729 for my $child ($self->children) { 2998 for my $child ($self->children) {
2730 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2731 3000
3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3002 if exists $child->{req_x};
3003
3004 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3005 if exists $child->{req_y};
3006
2732 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3007 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2733 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3008 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3009
2734 $child->configure ($X, $Y, $W, $H); 3010 $child->configure ($X, $Y, $W, $H);
2735 } 3011 }
2736} 3012}
2737 3013
2738sub _topleft { 3014sub coord2local {
2739 my ($self, $x, $y) = @_; 3015 my ($self, $x, $y) = @_;
2740 3016
2741 ($x, $y) 3017 ($x, $y)
2742} 3018}
2743 3019
3020sub coord2global {
3021 my ($self, $x, $y) = @_;
3022
3023 ($x, $y)
3024}
3025
2744sub update { 3026sub update {
2745 my ($self) = @_; 3027 my ($self) = @_;
2746 3028
2747 $self->check_size; 3029 $self->check_size;
2748 ::refresh (); 3030 $::WANT_REFRESH++;
2749} 3031}
2750 3032
2751sub add { 3033sub add {
2752 my ($self, $child) = @_; 3034 my ($self, @children) = @_;
2753 3035
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041
3042 for my $child (@children) {
3043 $child->{is_toplevel} = 1;
3044
2754 # integerize window positions 3045 # integerise window positions
2755 $child->{x} = int $child->{x}; 3046 $child->{x} = int $child->{x};
2756 $child->{y} = int $child->{y}; 3047 $child->{y} = int $child->{y};
3048 }
2757 3049
2758 $self->SUPER::add ($child); 3050 $self->SUPER::add (@children);
3051}
3052
3053sub remove {
3054 my ($self, @children) = @_;
3055
3056 $self->SUPER::remove (@children);
3057
3058 while (@children) {
3059 my $w = pop @children;
3060 push @children, $w->children;
3061 $w->set_invisible;
3062 }
2759} 3063}
2760 3064
2761sub on_refresh { 3065sub on_refresh {
2762 my ($self, $id, $cb) = @_; 3066 my ($self, $id, $cb) = @_;
2763 3067
2764 $self->{refresh_hook}{$id} = $cb; 3068 $self->{refresh_hook}{$id} = $cb;
2765} 3069}
2766 3070
3071sub on_post_alloc {
3072 my ($self, $id, $cb) = @_;
3073
3074 $self->{post_alloc_hook}{$id} = $cb;
3075}
3076
2767sub draw { 3077sub draw {
2768 my ($self) = @_; 3078 my ($self) = @_;
2769 3079
2770 while (my $rcb = delete $self->{refresh_hook}) { 3080 while ($self->{refresh_hook}) {
2771 $_->() for values %$rcb; 3081 $_->()
3082 for values %{delete $self->{refresh_hook}};
3083 }
3084
3085 if ($self->{check_size}) {
3086 my @queue = ([], []);
3087
3088 for (;;) {
3089 if ($self->{check_size}) {
3090 # heuristic: check containers last
3091 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3092 for values %{delete $self->{check_size}}
3093 }
3094
3095 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3096
3097 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3098 ? @$widget{qw(user_w user_h)}
3099 : $widget->size_request;
3100
3101 if (delete $widget->{force_alloc}
3102 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3103 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3104
3105 $widget->{req_w} = $w;
3106 $widget->{req_h} = $h;
3107
3108 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3109
3110 $widget->{parent}->check_size
3111 if $widget->{parent};
3112 }
3113 }
3114 }
3115
3116 while ($self->{size_alloc}) {
3117 for (values %{delete $self->{size_alloc}}) {
3118 my ($widget, $w, $h) = @$_;
3119
3120 $w = 0 if $w < 0;
3121 $h = 0 if $h < 0;
3122
3123 $widget->{w} = $w;
3124 $widget->{h} = $h;
3125 $widget->emit (size_allocate => $w, $h);
3126 }
3127 }
3128
3129 while ($self->{post_alloc_hook}) {
3130 $_->()
3131 for values %{delete $self->{post_alloc_hook}};
2772 } 3132 }
2773 3133
2774 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3134 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2775 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3135 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2776 glClear GL_COLOR_BUFFER_BIT; 3136 glClear GL_COLOR_BUFFER_BIT;
2777 3137
2778 glMatrixMode GL_PROJECTION; 3138 glMatrixMode GL_PROJECTION;
2779 glLoadIdentity; 3139 glLoadIdentity;
2780 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3140 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2781 glMatrixMode GL_MODELVIEW; 3141 glMatrixMode GL_MODELVIEW;
2782 glLoadIdentity; 3142 glLoadIdentity;
2783 3143
2784 $self->_draw; 3144 $self->_draw;
2785} 3145}
… …
2787############################################################################# 3147#############################################################################
2788 3148
2789package CFClient::UI; 3149package CFClient::UI;
2790 3150
2791$ROOT = new CFClient::UI::Root; 3151$ROOT = new CFClient::UI::Root;
2792$TOOLTIP = new CFClient::UI::Tooltip; 3152$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2793 3153
27941 31541
2795 3155

Diff Legend

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