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.237 by root, Thu May 25 21:36:45 2006 UTC

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

Diff Legend

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