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.174 by root, Tue Apr 25 11:18:49 2006 UTC vs.
Revision 1.241 by root, Fri May 26 20:50:35 2006 UTC

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

Diff Legend

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