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.234 by root, Thu May 25 16:24:44 2006 UTC

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

Diff Legend

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